diff mbox

Revert "ARM: shmobile: Disallow PINCTRL without GPIOLIB"

Message ID 1369969227-11742-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State Superseded
Headers show

Commit Message

Laurent Pinchart May 31, 2013, 3 a.m. UTC
GPIOLIB dependency handling was added to the PINCTRL core by

commit 2afe8229687ec24cbc07e78449a588bb8b68f858
Author: Haojian Zhuang <haojian.zhuang@linaro.org>
Date:   Thu Mar 28 07:34:19 2013 +0800

    pinctrl: core: add dependence of GPIOLIB

There is not need to handle that dependency at the SH Mobile level
anymore. Revert

commit 6722f6cb763203cab775297b6e9d00834af0d6d7
Author: Magnus Damm <damm@opensource.se>
Date:   Mon Mar 18 22:58:18 2013 +0900

    ARM: shmobile: Disallow PINCTRL without GPIOLIB

    Modify mach-shmobile to only select PINCTRL in case of
    ARCH_WANT_OPTIONAL_GPIOLIB is set.

    This fixes a build error triggered when adding a new SoC
    lacking GPIO software support (ARCH_WANT_OPTIONAL_GPIOLIB=n):

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

The patch has been tested by hacking arch/arm/mach-shmobile/Kconfig to remove
ARCH_WANT_OPTIONAL_GPIOLIB selection from ARCH_EMEV2. The kernel then compiles
fine with PINCTRL enabled and GPIOLIB disabled.

Comments

Simon Horman May 31, 2013, 5:40 a.m. UTC | #1
On Fri, May 31, 2013 at 05:00:27AM +0200, Laurent Pinchart wrote:
> GPIOLIB dependency handling was added to the PINCTRL core by
> 
> commit 2afe8229687ec24cbc07e78449a588bb8b68f858
> Author: Haojian Zhuang <haojian.zhuang@linaro.org>
> Date:   Thu Mar 28 07:34:19 2013 +0800
> 
>     pinctrl: core: add dependence of GPIOLIB
> 
> There is not need to handle that dependency at the SH Mobile level
> anymore. Revert
> 
> commit 6722f6cb763203cab775297b6e9d00834af0d6d7
> Author: Magnus Damm <damm@opensource.se>
> Date:   Mon Mar 18 22:58:18 2013 +0900
> 
>     ARM: shmobile: Disallow PINCTRL without GPIOLIB
> 
>     Modify mach-shmobile to only select PINCTRL in case of
>     ARCH_WANT_OPTIONAL_GPIOLIB is set.
> 
>     This fixes a build error triggered when adding a new SoC
>     lacking GPIO software support (ARCH_WANT_OPTIONAL_GPIOLIB=n):
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> The patch has been tested by hacking arch/arm/mach-shmobile/Kconfig to remove
> ARCH_WANT_OPTIONAL_GPIOLIB selection from ARCH_EMEV2. The kernel then compiles
> fine with PINCTRL enabled and GPIOLIB disabled.

Hi Laurent,

could you clarify if this is for v3.11 or v3.10?

> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 49d993c..dfb4fee 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -645,7 +645,7 @@ config ARCH_SHMOBILE
>  	select MULTI_IRQ_HANDLER
>  	select NEED_MACH_MEMORY_H
>  	select NO_IOPORT
> -	select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
> +	select PINCTRL
>  	select PM_GENERIC_DOMAINS if PM
>  	select SPARSE_IRQ
>  	help
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart May 31, 2013, 7:30 a.m. UTC | #2
Hi Simon,

On Friday 31 May 2013 14:40:11 Simon Horman wrote:
> On Fri, May 31, 2013 at 05:00:27AM +0200, Laurent Pinchart wrote:
> > GPIOLIB dependency handling was added to the PINCTRL core by
> > 
> > commit 2afe8229687ec24cbc07e78449a588bb8b68f858
> > Author: Haojian Zhuang <haojian.zhuang@linaro.org>
> > Date:   Thu Mar 28 07:34:19 2013 +0800
> > 
> >     pinctrl: core: add dependence of GPIOLIB
> > 
> > There is not need to handle that dependency at the SH Mobile level
> > anymore. Revert
> > 
> > commit 6722f6cb763203cab775297b6e9d00834af0d6d7
> > Author: Magnus Damm <damm@opensource.se>
> > Date:   Mon Mar 18 22:58:18 2013 +0900
> > 
> >     ARM: shmobile: Disallow PINCTRL without GPIOLIB
> >     
> >     Modify mach-shmobile to only select PINCTRL in case of
> >     ARCH_WANT_OPTIONAL_GPIOLIB is set.
> >     
> >     This fixes a build error triggered when adding a new SoC
> > 
> >     lacking GPIO software support (ARCH_WANT_OPTIONAL_GPIOLIB=n):
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  arch/arm/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > The patch has been tested by hacking arch/arm/mach-shmobile/Kconfig to
> > remove ARCH_WANT_OPTIONAL_GPIOLIB selection from ARCH_EMEV2. The kernel
> > then compiles fine with PINCTRL enabled and GPIOLIB disabled.
> 
> Hi Laurent,
> 
> could you clarify if this is for v3.11 or v3.10?

No urgency here, v3.11 is fine.

> 
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index 49d993c..dfb4fee 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -645,7 +645,7 @@ config ARCH_SHMOBILE
> > 
> >  	select MULTI_IRQ_HANDLER
> >  	select NEED_MACH_MEMORY_H
> >  	select NO_IOPORT
> > 
> > -	select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
> > +	select PINCTRL
> > 
> >  	select PM_GENERIC_DOMAINS if PM
> >  	select SPARSE_IRQ
> >  	help
Simon Horman May 31, 2013, 7:53 a.m. UTC | #3
On Fri, May 31, 2013 at 02:40:11PM +0900, Simon Horman wrote:
> On Fri, May 31, 2013 at 05:00:27AM +0200, Laurent Pinchart wrote:
> > GPIOLIB dependency handling was added to the PINCTRL core by
> > 
> > commit 2afe8229687ec24cbc07e78449a588bb8b68f858
> > Author: Haojian Zhuang <haojian.zhuang@linaro.org>
> > Date:   Thu Mar 28 07:34:19 2013 +0800
> > 
> >     pinctrl: core: add dependence of GPIOLIB
> > 
> > There is not need to handle that dependency at the SH Mobile level
> > anymore. Revert
> > 
> > commit 6722f6cb763203cab775297b6e9d00834af0d6d7
> > Author: Magnus Damm <damm@opensource.se>
> > Date:   Mon Mar 18 22:58:18 2013 +0900
> > 
> >     ARM: shmobile: Disallow PINCTRL without GPIOLIB
> > 
> >     Modify mach-shmobile to only select PINCTRL in case of
> >     ARCH_WANT_OPTIONAL_GPIOLIB is set.
> > 
> >     This fixes a build error triggered when adding a new SoC
> >     lacking GPIO software support (ARCH_WANT_OPTIONAL_GPIOLIB=n):
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> >  arch/arm/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > The patch has been tested by hacking arch/arm/mach-shmobile/Kconfig to remove
> > ARCH_WANT_OPTIONAL_GPIOLIB selection from ARCH_EMEV2. The kernel then compiles
> > fine with PINCTRL enabled and GPIOLIB disabled.
> 
> Hi Laurent,
> 
> could you clarify if this is for v3.11 or v3.10?

As discussed over coffee, I'll queue it up for v3.11.

> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index 49d993c..dfb4fee 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -645,7 +645,7 @@ config ARCH_SHMOBILE
> >  	select MULTI_IRQ_HANDLER
> >  	select NEED_MACH_MEMORY_H
> >  	select NO_IOPORT
> > -	select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
> > +	select PINCTRL
> >  	select PM_GENERIC_DOMAINS if PM
> >  	select SPARSE_IRQ
> >  	help
> > -- 
> > Regards,
> > 
> > Laurent Pinchart
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman June 4, 2013, 2:14 a.m. UTC | #4
On Fri, May 31, 2013 at 09:30:39AM +0200, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 31 May 2013 14:40:11 Simon Horman wrote:
> > On Fri, May 31, 2013 at 05:00:27AM +0200, Laurent Pinchart wrote:
> > > GPIOLIB dependency handling was added to the PINCTRL core by
> > > 
> > > commit 2afe8229687ec24cbc07e78449a588bb8b68f858
> > > Author: Haojian Zhuang <haojian.zhuang@linaro.org>
> > > Date:   Thu Mar 28 07:34:19 2013 +0800
> > > 
> > >     pinctrl: core: add dependence of GPIOLIB
> > > 
> > > There is not need to handle that dependency at the SH Mobile level
> > > anymore. Revert
> > > 
> > > commit 6722f6cb763203cab775297b6e9d00834af0d6d7
> > > Author: Magnus Damm <damm@opensource.se>
> > > Date:   Mon Mar 18 22:58:18 2013 +0900
> > > 
> > >     ARM: shmobile: Disallow PINCTRL without GPIOLIB
> > >     
> > >     Modify mach-shmobile to only select PINCTRL in case of
> > >     ARCH_WANT_OPTIONAL_GPIOLIB is set.
> > >     
> > >     This fixes a build error triggered when adding a new SoC
> > > 
> > >     lacking GPIO software support (ARCH_WANT_OPTIONAL_GPIOLIB=n):
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > > ---
> > > 
> > >  arch/arm/Kconfig | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > The patch has been tested by hacking arch/arm/mach-shmobile/Kconfig to
> > > remove ARCH_WANT_OPTIONAL_GPIOLIB selection from ARCH_EMEV2. The kernel
> > > then compiles fine with PINCTRL enabled and GPIOLIB disabled.
> > 
> > Hi Laurent,
> > 
> > could you clarify if this is for v3.11 or v3.10?
> 
> No urgency here, v3.11 is fine.

Thanks, I will queue this up in the pinmux branch and
endeavour to get it included in v3.11.

> > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > > index 49d993c..dfb4fee 100644
> > > --- a/arch/arm/Kconfig
> > > +++ b/arch/arm/Kconfig
> > > @@ -645,7 +645,7 @@ config ARCH_SHMOBILE
> > > 
> > >  	select MULTI_IRQ_HANDLER
> > >  	select NEED_MACH_MEMORY_H
> > >  	select NO_IOPORT
> > > 
> > > -	select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
> > > +	select PINCTRL
> > > 
> > >  	select PM_GENERIC_DOMAINS if PM
> > >  	select SPARSE_IRQ
> > >  	help
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 49d993c..dfb4fee 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -645,7 +645,7 @@  config ARCH_SHMOBILE
 	select MULTI_IRQ_HANDLER
 	select NEED_MACH_MEMORY_H
 	select NO_IOPORT
-	select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
+	select PINCTRL
 	select PM_GENERIC_DOMAINS if PM
 	select SPARSE_IRQ
 	help