aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-mxs.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 62b7e8ee1163..424d38e59421 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -46,7 +46,6 @@
46#include <linux/gpio.h> 46#include <linux/gpio.h>
47#include <linux/regulator/consumer.h> 47#include <linux/regulator/consumer.h>
48#include <linux/module.h> 48#include <linux/module.h>
49#include <linux/pinctrl/consumer.h>
50#include <linux/stmp_device.h> 49#include <linux/stmp_device.h>
51#include <linux/spi/spi.h> 50#include <linux/spi/spi.h>
52#include <linux/spi/mxs-spi.h> 51#include <linux/spi/mxs-spi.h>
@@ -500,7 +499,6 @@ static int mxs_spi_probe(struct platform_device *pdev)
500 struct mxs_spi *spi; 499 struct mxs_spi *spi;
501 struct mxs_ssp *ssp; 500 struct mxs_ssp *ssp;
502 struct resource *iores; 501 struct resource *iores;
503 struct pinctrl *pinctrl;
504 struct clk *clk; 502 struct clk *clk;
505 void __iomem *base; 503 void __iomem *base;
506 int devid, clk_freq; 504 int devid, clk_freq;
@@ -522,10 +520,6 @@ static int mxs_spi_probe(struct platform_device *pdev)
522 if (IS_ERR(base)) 520 if (IS_ERR(base))
523 return PTR_ERR(base); 521 return PTR_ERR(base);
524 522
525 pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
526 if (IS_ERR(pinctrl))
527 return PTR_ERR(pinctrl);
528
529 clk = devm_clk_get(&pdev->dev, NULL); 523 clk = devm_clk_get(&pdev->dev, NULL);
530 if (IS_ERR(clk)) 524 if (IS_ERR(clk))
531 return PTR_ERR(clk); 525 return PTR_ERR(clk);