| Message ID | 1361926029-12518-1-git-send-email-wenyou.yang@atmel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 27 February 2013 01:47, Wenyou Yang <wenyou.yang@atmel.com> wrote: > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > Cc: spi-devel-general@lists.sourceforge.net > Cc: linux-kernel@vger.kernel.org > --- > drivers/spi/spi-atmel.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c > index 00ca85f..0ed3e1a 100644 > --- a/drivers/spi/spi-atmel.c > +++ b/drivers/spi/spi-atmel.c > @@ -23,6 +23,7 @@ > #include <linux/platform_data/atmel.h> > #include <linux/platform_data/dma-atmel.h> > #include <linux/of.h> > +#include <linux/pinctrl/consumer.h> > > #include <asm/io.h> > #include <asm/gpio.h> > @@ -1503,11 +1504,18 @@ static int atmel_spi_probe(struct platform_device *pdev) > int ret; > struct spi_master *master; > struct atmel_spi *as; > + struct pinctrl *pinctrl; > > regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (!regs) > return -ENXIO; > > + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); > + if (IS_ERR(pinctrl)) { > + dev_err(&pdev->dev, "Failed to request pinctrl\n"); > + return PTR_ERR(pinctrl); > + } > + This patch should be dropped since driver core will now do this for us. regards Joachim Eastwood ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 00ca85f..0ed3e1a 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -23,6 +23,7 @@ #include <linux/platform_data/atmel.h> #include <linux/platform_data/dma-atmel.h> #include <linux/of.h> +#include <linux/pinctrl/consumer.h> #include <asm/io.h> #include <asm/gpio.h> @@ -1503,11 +1504,18 @@ static int atmel_spi_probe(struct platform_device *pdev) int ret; struct spi_master *master; struct atmel_spi *as; + struct pinctrl *pinctrl; regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!regs) return -ENXIO; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + dev_err(&pdev->dev, "Failed to request pinctrl\n"); + return PTR_ERR(pinctrl); + } + irq = platform_get_irq(pdev, 0); if (irq < 0) return irq;
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Cc: spi-devel-general@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org --- drivers/spi/spi-atmel.c | 8 ++++++++ 1 file changed, 8 insertions(+)