| From c0d23e8fc92737a782af4971ae7f96942d2c3481 Mon Sep 17 00:00:00 2001 |
| From: Fabio Estevam <fabio.estevam@freescale.com> |
| Date: Tue, 21 May 2013 11:24:45 -0300 |
| Subject: imx-drm: imx-tve: Let device core handle pinctrl |
| |
| Since commit ab78029 (drivers/pinctrl: grab default handles from device core) |
| we can rely on device core for handling pinctrl, so remove |
| devm_pinctrl_get_select_default() from the driver. |
| |
| Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> |
| Acked-by: Shawn Guo <shawn.guo@linaro.org> |
| Acked-by: Sascha Hauer <s.hauer@pengutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 15f29f7f5b59429f81ff295939d30c36e69f9b2c) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/staging/imx-drm/imx-tve.c | 10 ---------- |
| 1 file changed, 10 deletions(-) |
| |
| diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c |
| index 03892de9bd7e..42f141eb183d 100644 |
| --- a/drivers/staging/imx-drm/imx-tve.c |
| +++ b/drivers/staging/imx-drm/imx-tve.c |
| @@ -22,7 +22,6 @@ |
| #include <linux/clk-provider.h> |
| #include <linux/module.h> |
| #include <linux/of_i2c.h> |
| -#include <linux/pinctrl/consumer.h> |
| #include <linux/regmap.h> |
| #include <linux/regulator/consumer.h> |
| #include <linux/spinlock.h> |
| @@ -610,15 +609,6 @@ static int imx_tve_probe(struct platform_device *pdev) |
| } |
| |
| if (tve->mode == TVE_MODE_VGA) { |
| - struct pinctrl *pinctrl; |
| - |
| - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); |
| - if (IS_ERR(pinctrl)) { |
| - ret = PTR_ERR(pinctrl); |
| - dev_warn(&pdev->dev, "failed to setup pinctrl: %d", ret); |
| - return ret; |
| - } |
| - |
| ret = of_property_read_u32(np, "fsl,hsync-pin", &tve->hsync_pin); |
| if (ret < 0) { |
| dev_err(&pdev->dev, "failed to get vsync pin\n"); |
| -- |
| 1.8.5.rc3 |
| |
