[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
in turn will select GENERIC_GPIO.  Because of this, there is no
reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
architectures that have ARCH_REQUIRE_GPIOLIB.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>

---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c5408bf..cdaa337 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -271,7 +271,6 @@ config ARCH_VERSATILE
 
 config ARCH_AT91
 	bool "Atmel AT91"
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select HAVE_CLK
 	help
@@ -299,7 +298,6 @@ config ARCH_CLPS711X
 config ARCH_GEMINI
 	bool "Cortina Systems Gemini"
 	select CPU_FA526
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	help
 	  Support for the Cortina Systems Gemini family SoCs
@@ -320,7 +318,6 @@ config ARCH_EP93XX
 	select CPU_ARM920T
 	select ARM_AMBA
 	select ARM_VIC
-	select GENERIC_GPIO
 	select HAVE_CLK
 	select COMMON_CLKDEV
 	select ARCH_REQUIRE_GPIOLIB
@@ -354,7 +351,6 @@ config ARCH_STMP3XXX
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
-	select GENERIC_GPIO
 	select USB_ARCH_HAS_EHCI
 	help
 	  Support for systems based on the Freescale 3xxx CPUs.
@@ -392,7 +388,6 @@ config ARCH_IOP32X
 	select CPU_XSCALE
 	select PLAT_IOP
 	select PCI
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	help
 	  Support for Intel's 80219 and IOP32X (XScale) family of
@@ -404,7 +399,6 @@ config ARCH_IOP33X
 	select CPU_XSCALE
 	select PLAT_IOP
 	select PCI
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	help
 	  Support for Intel's IOP33X (XScale) family of processors.
@@ -453,7 +447,6 @@ config ARCH_L7200
 config ARCH_DOVE
 	bool "Marvell Dove"
 	select PCI
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
@@ -465,7 +458,6 @@ config ARCH_KIRKWOOD
 	bool "Marvell Kirkwood"
 	select CPU_FEROCEON
 	select PCI
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
@@ -487,7 +479,6 @@ config ARCH_MV78XX0
 	bool "Marvell MV78xx0"
 	select CPU_FEROCEON
 	select PCI
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
@@ -501,7 +492,6 @@ config ARCH_ORION5X
 	depends on MMU
 	select CPU_FEROCEON
 	select PCI
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
@@ -514,7 +504,6 @@ config ARCH_ORION5X
 config ARCH_MMP
 	bool "Marvell PXA168/910/MMP2"
 	depends on MMU
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select HAVE_CLK
 	select COMMON_CLKDEV
@@ -528,7 +517,6 @@ config ARCH_MMP
 config ARCH_KS8695
 	bool "Micrel/Kendin KS8695"
 	select CPU_ARM922T
-	select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
 	help
 	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@@ -551,7 +539,6 @@ config ARCH_W90X900
 	bool "Nuvoton W90X900 CPU"
 	select CPU_ARM926T
 	select ARCH_REQUIRE_GPIOLIB
-	select GENERIC_GPIO
 	select HAVE_CLK
 	select COMMON_CLKDEV
 	select GENERIC_TIME
@@ -587,7 +574,6 @@ config ARCH_PXA
 	depends on MMU
 	select ARCH_MTD_XIP
 	select ARCH_HAS_CPUFREQ
-	select GENERIC_GPIO
 	select HAVE_CLK
 	select COMMON_CLKDEV
 	select ARCH_REQUIRE_GPIOLIB
@@ -636,7 +622,6 @@ config ARCH_SA1100
 	select ARCH_MTD_XIP
 	select ARCH_HAS_CPUFREQ
 	select CPU_FREQ
-	select GENERIC_GPIO
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	select HAVE_CLK
@@ -659,7 +644,6 @@ config ARCH_S3C64XX
 	bool "Samsung S3C64XX"
 	select PLAT_SAMSUNG
 	select CPU_V6
-	select GENERIC_GPIO
 	select ARM_VIC
 	select HAVE_CLK
 	select NO_IOPORT
@@ -768,7 +752,6 @@ config ARCH_NOMADIK
 	select COMMON_CLKDEV
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	help
 	  Support for the Nomadik platform by ST-Ericsson
@@ -778,7 +761,6 @@ config ARCH_DAVINCI
 	select CPU_ARM926T
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select HAVE_CLK
 	select ZONE_DMA
@@ -791,7 +773,6 @@ config ARCH_DAVINCI
 
 config ARCH_OMAP
 	bool "TI OMAP"
-	select GENERIC_GPIO
 	select HAVE_CLK
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_HAS_CPUFREQ

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

On Friday, April 02, 2010 1:55 AM, Eric Miao wrote:
> On Fri, Apr 2, 2010 at 6:32 AM, H Hartley Sweeten <hartleys@visionengravers.com> wrote:
>> The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
>> in turn will select GENERIC_GPIO. ?Because of this, there is no
>> reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
>> architectures that have ARCH_REQUIRE_GPIOLIB.
>>
>> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
>>
>
> A clean removal, Acked-by: Eric Miao <eric.y.miao@gmail.com>

Thanks.

Your reply was just to me.  This is just to make sure it's on the arm list.

Regards,
Hartley

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[Russell King - ARM Linux]

On Thu, Apr 01, 2010 at 05:32:18PM -0500, H Hartley Sweeten wrote:
> The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
> in turn will select GENERIC_GPIO.  Because of this, there is no
> reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
> architectures that have ARCH_REQUIRE_GPIOLIB.

This kind of patch normally causes regular merge conflicts, which
historically have caused a repeated number of headaches - there's
a similar patch for GENERIC_TIME which is pending.

I suggest waiting until we're closer to the merge window than we
are at present; I'll bring my devel stuff to a freeze state before
hand so we can get these two patches merged - maybe around the
-rc7 release.

Please ping me closer to that.

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

On Monday, April 12, 2010 11:49 AM, Russell King wrote:
> On Thu, Apr 01, 2010 at 05:32:18PM -0500, H Hartley Sweeten wrote:
>> The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
>> in turn will select GENERIC_GPIO.  Because of this, there is no
>> reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
>> architectures that have ARCH_REQUIRE_GPIOLIB.
>
> This kind of patch normally causes regular merge conflicts, which
> historically have caused a repeated number of headaches - there's
> a similar patch for GENERIC_TIME which is pending.
>
> I suggest waiting until we're closer to the merge window than we
> are at present; I'll bring my devel stuff to a freeze state before
> hand so we can get these two patches merged - maybe around the
> -rc7 release.
>
> Please ping me closer to that.

Will do.

I just wanted to get this out there to make sure nobody saw any issues.

I will hold this until around -rc7 as you requested and just collect any
Ack's, etc., that show up.  Eric Miao has already sent an Acked-by that
I will add then.

Regards,
Hartley

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[Russell King - ARM Linux]

On Mon, Apr 12, 2010 at 02:01:17PM -0500, H Hartley Sweeten wrote:
> On Monday, April 12, 2010 11:49 AM, Russell King wrote:
> > On Thu, Apr 01, 2010 at 05:32:18PM -0500, H Hartley Sweeten wrote:
> >> The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
> >> in turn will select GENERIC_GPIO.  Because of this, there is no
> >> reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
> >> architectures that have ARCH_REQUIRE_GPIOLIB.
> >
> > This kind of patch normally causes regular merge conflicts, which
> > historically have caused a repeated number of headaches - there's
> > a similar patch for GENERIC_TIME which is pending.
> >
> > I suggest waiting until we're closer to the merge window than we
> > are at present; I'll bring my devel stuff to a freeze state before
> > hand so we can get these two patches merged - maybe around the
> > -rc7 release.
> >
> > Please ping me closer to that.
> 
> Will do.
> 
> I just wanted to get this out there to make sure nobody saw any issues.
> 
> I will hold this until around -rc7 as you requested and just collect any
> Ack's, etc., that show up.  Eric Miao has already sent an Acked-by that
> I will add then.

Also please keep an eye for any new places in -next where GENERIC_GPIO
is selected as well as ARCH_REQUIRE_GPIOLIB - we're likely to see new
platforms being added which may continue the old mistake.

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

On Monday, April 12, 2010 12:15 PM, Russell King wrote:
> On Mon, Apr 12, 2010 at 02:01:17PM -0500, H Hartley Sweeten wrote:
> On Monday, April 12, 2010 11:49 AM, Russell King wrote:
>>> On Thu, Apr 01, 2010 at 05:32:18PM -0500, H Hartley Sweeten wrote:
>>>> The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
>>>> in turn will select GENERIC_GPIO.  Because of this, there is no
>>>> reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
>>>> architectures that have ARCH_REQUIRE_GPIOLIB.
>>>
>>> This kind of patch normally causes regular merge conflicts, which
>>> historically have caused a repeated number of headaches - there's
>>> a similar patch for GENERIC_TIME which is pending.
>>>
>>> I suggest waiting until we're closer to the merge window than we
>>> are at present; I'll bring my devel stuff to a freeze state before
>>> hand so we can get these two patches merged - maybe around the
>>> -rc7 release.
>>>
>>> Please ping me closer to that.
>> 
>> Will do.
>> 
>> I just wanted to get this out there to make sure nobody saw any issues.
>> 
>> I will hold this until around -rc7 as you requested and just collect any
>> Ack's, etc., that show up.  Eric Miao has already sent an Acked-by that
>> I will add then.
>
> Also please keep an eye for any new places in -next where GENERIC_GPIO
> is selected as well as ARCH_REQUIRE_GPIOLIB - we're likely to see new
> platforms being added which may continue the old mistake.

Russell,

-rc7 should be coming soon.  Would you like this patch rebased now or after
Linus releases -rc7?  Also, I assume it should be rebased to linux-next or
would you prefer it rebased to one of your branches?

Regards,
Hartley

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[Russell King - ARM Linux]

On Thu, May 06, 2010 at 12:29:34PM -0500, H Hartley Sweeten wrote:
> -rc7 should be coming soon.  Would you like this patch rebased now or after
> Linus releases -rc7?  Also, I assume it should be rebased to linux-next or
> would you prefer it rebased to one of your branches?

Thanks for reminding me.

This time around, there's a number of patches which can only sensibly
be applied once I've frozen most of the individual branches of my tree,
and this is one of them.  Essentually, these are:
- your 'select GPIOLIB' patch
- killing the 'select GENERIC_TIME' from the ARM Kconfig menus
- pmu/oprofile patch set

Freezing it before -rc7 is released would be too early, so I think doing
so shortly after -rc7 (which is due this evening/tonight) would be the
right time.

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

On Thursday, May 06, 2010 1:43 PM, Russell King wrote:
> On Thu, May 06, 2010 at 12:29:34PM -0500, H Hartley Sweeten wrote:
>> -rc7 should be coming soon.  Would you like this patch rebased now or after
>> Linus releases -rc7?  Also, I assume it should be rebased to linux-next or
>> would you prefer it rebased to one of your branches?
>
> Thanks for reminding me.
>
> This time around, there's a number of patches which can only sensibly
> be applied once I've frozen most of the individual branches of my tree,
> and this is one of them.  Essentually, these are:
> - your 'select GPIOLIB' patch
> - killing the 'select GENERIC_TIME' from the ARM Kconfig menus
> - pmu/oprofile patch set
>
> Freezing it before -rc7 is released would be too early, so I think doing
> so shortly after -rc7 (which is due this evening/tonight) would be the
> right time.

Hello Russell,

I see Linus released -rc7 over the weekend.  When will you be freezing your
-devel tree?  I will rebase the 'select GPIOLIB' patch after that.

Regards,
Hartley

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

On Monday, May 10, 2010 9:42 AM, H Hartley Sweeten wrote:
> On Thursday, May 06, 2010 1:43 PM, Russell King wrote:
>> On Thu, May 06, 2010 at 12:29:34PM -0500, H Hartley Sweeten wrote:
>>> -rc7 should be coming soon.  Would you like this patch rebased now or after
>>> Linus releases -rc7?  Also, I assume it should be rebased to linux-next or
>>> would you prefer it rebased to one of your branches?
>>
>> Thanks for reminding me.
>>
>> This time around, there's a number of patches which can only sensibly
>> be applied once I've frozen most of the individual branches of my tree,
>> and this is one of them.  Essentually, these are:
>> - your 'select GPIOLIB' patch
>> - killing the 'select GENERIC_TIME' from the ARM Kconfig menus
>> - pmu/oprofile patch set
>>
>> Freezing it before -rc7 is released would be too early, so I think doing
>> so shortly after -rc7 (which is due this evening/tonight) would be the
>> right time.
>
> Hello Russell,
>
> I see Linus released -rc7 over the weekend.  When will you be freezing your
> -devel tree?  I will rebase the 'select GPIOLIB' patch after that.

Russell,

Ping... ;-)

Are you ready for this patch to be rebased, and to what tree?

Regards,
Hartley

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[Russell King - ARM Linux]

On Thu, May 13, 2010 at 05:53:10PM -0500, H Hartley Sweeten wrote:
> Russell,
> 
> Ping... ;-)
> 
> Are you ready for this patch to be rebased, and to what tree?

I've not forgotten; I've just posted the notice about closing my tree
down this weekend, and once that's been done I'll be dealing with this
and another lose end.

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[Russell King - ARM Linux]

On Thu, May 13, 2010 at 05:53:10PM -0500, H Hartley Sweeten wrote:
> Are you ready for this patch to be rebased, and to what tree?

Can you rebase onto what's currently in the devel tree, and send the
resulting patch to the patch system please?

(for others, I've temporarily dropped some merges on the devel tree.)

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

On Sunday, May 16, 2010 7:50 AM, Russell King wrote:
> On Thu, May 13, 2010 at 05:53:10PM -0500, H Hartley Sweeten wrote:
>> Are you ready for this patch to be rebased, and to what tree?
>
> Can you rebase onto what's currently in the devel tree, and send the
> resulting patch to the patch system please?

Russell,

I'm pulling your tree right now.  I will post the rebased patch ASAP.

Sorry for the delay,
Hartley

> (for others, I've temporarily dropped some merges on the devel tree.)

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[H Hartley Sweeten]

Added to patch system as Patch #6136.

Thanks,
Hartley 

-----Original Message-----
From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk] 
Sent: Sunday, May 16, 2010 7:50 AM
To: H Hartley Sweeten
Cc: linux-arm-kernel at lists.infradead.org
Subject: Re: [PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

On Thu, May 13, 2010 at 05:53:10PM -0500, H Hartley Sweeten wrote:
> Are you ready for this patch to be rebased, and to what tree?

Can you rebase onto what's currently in the devel tree, and send the
resulting patch to the patch system please?

(for others, I've temporarily dropped some merges on the devel tree.)

[PATCH] arm: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO

[Russell King - ARM Linux]

On Mon, May 17, 2010 at 11:20:02AM -0500, H Hartley Sweeten wrote:
> Added to patch system as Patch #6136.

Thanks, all merged and pushed out, with everything back that was dropped.

Now just need John's GENERIC_TIME patch and we're all set.

Thanks.