diff mbox

[v6,12/16] spi/spi-atmel: add pinctrl support for atmel spi

Message ID 1362627243-9351-1-git-send-email-wenyou.yang@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wenyou Yang March 7, 2013, 3:34 a.m. UTC
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(+)

Comments

Jean-Christophe PLAGNIOL-VILLARD March 11, 2013, 1:11 p.m. UTC | #1
On 11:34 Thu 07 Mar     , Wenyou Yang 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 1e212d1..6b166f4 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 <linux/io.h>
>  #include <linux/gpio.h>
> @@ -1493,11 +1494,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);
> +	}

drop this, this is handled at bus level

Best Regards,
J.
> +
>  	irq = platform_get_irq(pdev, 0);
>  	if (irq < 0)
>  		return irq;
> -- 
> 1.7.9.5
>
Wenyou Yang March 12, 2013, 1:10 a.m. UTC | #2
Hi JC,

> -----Original Message-----

> From: Jean-Christophe PLAGNIOL-VILLARD [mailto:plagnioj@jcrosoft.com]

> Sent: 2013?3?11? 21:11

> To: Yang, Wenyou

> Cc: linux-arm-kernel@lists.infradead.org; grant.likely@secretlab.ca; Ferre,

> Nicolas; richard.genoud@gmail.com; Lin, JM;

> spi-devel-general@lists.sourceforge.net; linux-kernel@vger.kernel.org

> Subject: Re: [PATCH v6 12/16] spi/spi-atmel: add pinctrl support for atmel spi

> 

> On 11:34 Thu 07 Mar     , Wenyou Yang 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 1e212d1..6b166f4 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 <linux/io.h>

> >  #include <linux/gpio.h>

> > @@ -1493,11 +1494,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);

> > +	}

> 

> drop this, this is handled at bus level

> 

Thanks a lot for your advance.

> Best Regards,

> J.


Best Regards
Wenyou Yang
> > +

> >  	irq = platform_get_irq(pdev, 0);

> >  	if (irq < 0)

> >  		return irq;

> > --

> > 1.7.9.5

> >
diff mbox

Patch

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 1e212d1..6b166f4 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 <linux/io.h>
 #include <linux/gpio.h>
@@ -1493,11 +1494,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;