diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-06 14:05:56 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 10:19:08 -0400 |
commit | 86db3b04fe386caa98bb4be00408f082b60a74b0 (patch) | |
tree | 2d85d27a2d380b6796ceda919e61e2e6eaee3e8c /drivers/spi | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
spi: spi-mxs: 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')
-rw-r--r-- | drivers/spi/spi-mxs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index 84982768cd10..88fe1cfcbc65 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> |
@@ -506,7 +505,6 @@ static int mxs_spi_probe(struct platform_device *pdev) | |||
506 | struct mxs_spi *spi; | 505 | struct mxs_spi *spi; |
507 | struct mxs_ssp *ssp; | 506 | struct mxs_ssp *ssp; |
508 | struct resource *iores; | 507 | struct resource *iores; |
509 | struct pinctrl *pinctrl; | ||
510 | struct clk *clk; | 508 | struct clk *clk; |
511 | void __iomem *base; | 509 | void __iomem *base; |
512 | int devid, clk_freq; | 510 | int devid, clk_freq; |
@@ -528,10 +526,6 @@ static int mxs_spi_probe(struct platform_device *pdev) | |||
528 | if (IS_ERR(base)) | 526 | if (IS_ERR(base)) |
529 | return PTR_ERR(base); | 527 | return PTR_ERR(base); |
530 | 528 | ||
531 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
532 | if (IS_ERR(pinctrl)) | ||
533 | return PTR_ERR(pinctrl); | ||
534 | |||
535 | clk = devm_clk_get(&pdev->dev, NULL); | 529 | clk = devm_clk_get(&pdev->dev, NULL); |
536 | if (IS_ERR(clk)) | 530 | if (IS_ERR(clk)) |
537 | return PTR_ERR(clk); | 531 | return PTR_ERR(clk); |