diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-06 15:05:50 -0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2013-06-12 20:39:05 +0200 |
| commit | 76b1f723c4f54c2ab05307da3cc5c39e421b029b (patch) | |
| tree | 8e2e890bb7308c0f25ce4c13930e1bd1091536b9 /drivers/i2c | |
| parent | 4243fa0bad551b8c8d4ff7104e8fd557ae848845 (diff) | |
| download | linux-76b1f723c4f54c2ab05307da3cc5c39e421b029b.tar.gz linux-76b1f723c4f54c2ab05307da3cc5c39e421b029b.tar.bz2 linux-76b1f723c4f54c2ab05307da3cc5c39e421b029b.zip | |
i2c: imx: 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>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 82f20c60bb7b..8c7526ca912e 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -51,7 +51,6 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_i2c.h> -#include <linux/pinctrl/consumer.h> #include <linux/platform_data/i2c-imx.h> /** Defines ******************************************************************** @@ -493,7 +492,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) struct imx_i2c_struct *i2c_imx; struct resource *res; struct imxi2c_platform_data *pdata = pdev->dev.platform_data; - struct pinctrl *pinctrl; void __iomem *base; int irq, ret; u32 bitrate; @@ -535,12 +533,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) i2c_imx->adapter.dev.of_node = pdev->dev.of_node; i2c_imx->base = base; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - dev_err(&pdev->dev, "can't get/select pinctrl\n"); - return PTR_ERR(pinctrl); - } - /* Get I2C clock */ i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(i2c_imx->clk)) { |