diff options
Diffstat (limited to 'drivers/spi/spi-imx.c')
-rw-r--r-- | drivers/spi/spi-imx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index b805cd0e00b5..7db4f43ee4d8 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 | ||
@@ -759,7 +758,6 @@ static int spi_imx_probe(struct platform_device *pdev) | |||
759 | struct spi_master *master; | 758 | struct spi_master *master; |
760 | struct spi_imx_data *spi_imx; | 759 | struct spi_imx_data *spi_imx; |
761 | struct resource *res; | 760 | struct resource *res; |
762 | struct pinctrl *pinctrl; | ||
763 | int i, ret, num_cs; | 761 | int i, ret, num_cs; |
764 | 762 | ||
765 | if (!np && !mxc_platform_info) { | 763 | 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); |