aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-imx.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-05-06 14:05:55 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-13 10:12:09 -0400
commite9b3db6608a159f18bc4bf9657e4aeba24354ea1 (patch)
tree8319ae4b398c8015c3b2b28b10c0d389ac844eb5 /drivers/spi/spi-imx.c
parentf722406faae2d073cc1d01063d1123c35425939e (diff)
spi: spi-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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-imx.c')
-rw-r--r--drivers/spi/spi-imx.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 0befeeb522f4..9821ef1deb6f 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -37,7 +37,6 @@
37#include <linux/of.h> 37#include <linux/of.h>
38#include <linux/of_device.h> 38#include <linux/of_device.h>
39#include <linux/of_gpio.h> 39#include <linux/of_gpio.h>
40#include <linux/pinctrl/consumer.h>
41 40
42#include <linux/platform_data/spi-imx.h> 41#include <linux/platform_data/spi-imx.h>
43 42
@@ -760,7 +759,6 @@ static int spi_imx_probe(struct platform_device *pdev)
760 struct spi_master *master; 759 struct spi_master *master;
761 struct spi_imx_data *spi_imx; 760 struct spi_imx_data *spi_imx;
762 struct resource *res; 761 struct resource *res;
763 struct pinctrl *pinctrl;
764 int i, ret, num_cs; 762 int i, ret, num_cs;
765 763
766 if (!np && !mxc_platform_info) { 764 if (!np && !mxc_platform_info) {
@@ -848,12 +846,6 @@ static int spi_imx_probe(struct platform_device *pdev)
848 goto out_iounmap; 846 goto out_iounmap;
849 } 847 }
850 848
851 pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
852 if (IS_ERR(pinctrl)) {
853 ret = PTR_ERR(pinctrl);
854 goto out_free_irq;
855 }
856
857 spi_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); 849 spi_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
858 if (IS_ERR(spi_imx->clk_ipg)) { 850 if (IS_ERR(spi_imx->clk_ipg)) {
859 ret = PTR_ERR(spi_imx->clk_ipg); 851 ret = PTR_ERR(spi_imx->clk_ipg);