diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:59 +0100 |
| commit | 11e9168919433474d0ea42bb379804c3e0d848dc (patch) | |
| tree | 3f2ad756a659c86f6823e1b4137319d826f4130d /drivers/spi | |
| parent | 2a5c37cab3625cd5a16c01df82da5e70bd0bcc4e (diff) | |
| parent | e9b3db6608a159f18bc4bf9657e4aeba24354ea1 (diff) | |
| download | op-kernel-dev-11e9168919433474d0ea42bb379804c3e0d848dc.zip op-kernel-dev-11e9168919433474d0ea42bb379804c3e0d848dc.tar.gz | |
Merge remote-tracking branch 'spi/topic/imx' into spi-next
Diffstat (limited to 'drivers/spi')
| -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 b805cd0..7db4f43 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -37,7 +37,6 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_gpio.h> -#include <linux/pinctrl/consumer.h> #include <linux/platform_data/spi-imx.h> @@ -759,7 +758,6 @@ static int spi_imx_probe(struct platform_device *pdev) struct spi_master *master; struct spi_imx_data *spi_imx; struct resource *res; - struct pinctrl *pinctrl; int i, ret, num_cs; if (!np && !mxc_platform_info) { @@ -848,12 +846,6 @@ static int spi_imx_probe(struct platform_device *pdev) goto out_iounmap; } - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - ret = PTR_ERR(pinctrl); - goto out_free_irq; - } - spi_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); if (IS_ERR(spi_imx->clk_ipg)) { ret = PTR_ERR(spi_imx->clk_ipg); |
