diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-06 14:05:50 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-06-12 14:39:05 -0400 |
commit | 76b1f723c4f54c2ab05307da3cc5c39e421b029b (patch) | |
tree | 8e2e890bb7308c0f25ce4c13930e1bd1091536b9 /drivers/i2c | |
parent | 4243fa0bad551b8c8d4ff7104e8fd557ae848845 (diff) |
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 @@ | |||
51 | #include <linux/of.h> | 51 | #include <linux/of.h> |
52 | #include <linux/of_device.h> | 52 | #include <linux/of_device.h> |
53 | #include <linux/of_i2c.h> | 53 | #include <linux/of_i2c.h> |
54 | #include <linux/pinctrl/consumer.h> | ||
55 | #include <linux/platform_data/i2c-imx.h> | 54 | #include <linux/platform_data/i2c-imx.h> |
56 | 55 | ||
57 | /** Defines ******************************************************************** | 56 | /** Defines ******************************************************************** |
@@ -493,7 +492,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) | |||
493 | struct imx_i2c_struct *i2c_imx; | 492 | struct imx_i2c_struct *i2c_imx; |
494 | struct resource *res; | 493 | struct resource *res; |
495 | struct imxi2c_platform_data *pdata = pdev->dev.platform_data; | 494 | struct imxi2c_platform_data *pdata = pdev->dev.platform_data; |
496 | struct pinctrl *pinctrl; | ||
497 | void __iomem *base; | 495 | void __iomem *base; |
498 | int irq, ret; | 496 | int irq, ret; |
499 | u32 bitrate; | 497 | u32 bitrate; |
@@ -535,12 +533,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) | |||
535 | i2c_imx->adapter.dev.of_node = pdev->dev.of_node; | 533 | i2c_imx->adapter.dev.of_node = pdev->dev.of_node; |
536 | i2c_imx->base = base; | 534 | i2c_imx->base = base; |
537 | 535 | ||
538 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
539 | if (IS_ERR(pinctrl)) { | ||
540 | dev_err(&pdev->dev, "can't get/select pinctrl\n"); | ||
541 | return PTR_ERR(pinctrl); | ||
542 | } | ||
543 | |||
544 | /* Get I2C clock */ | 536 | /* Get I2C clock */ |
545 | i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); | 537 | i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); |
546 | if (IS_ERR(i2c_imx->clk)) { | 538 | if (IS_ERR(i2c_imx->clk)) { |