[GIT PULL] Removal of GENERIC_GPIO

[GIT PULL] Removal of GENERIC_GPIO

[Alex Courbot]

Hi Grant,

Here is the pull request for the GENERIC_GPIO removal. It is almost 
certain that a few fixups will be necessary - while I don't have precise 
patches, the following steps should ensure the state of the code is clean:

* "git grep CONFIG_GENERIC_GPIO" should return 0 hits. Matches should be 
replaced with CONFIG_GPIOLIB
* "git grep '\bGENERIC_GPIO\b'" should return 1 hit in the Chinese 
documentation. Selectors of GENERIC_GPIO should be turned into selectors 
of GPIOLIB, while definitions of the option in architecture code should 
be deleted.

Please let me know if there is something more I can do to ease your task.

Thanks,
Alex.

The following changes since commit 10b38669d64c757cfd927e3820292c580ed70aae:

   Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs 
(2013-03-19 15:17:40 -0700)

are available in the git repository at:

   git://github.com/Gnurou/linux.git for_grant

for you to fetch changes up to f4c54050640e7afa4749875cf9b900d42db361c0:

   gpio: update gpio Chinese documentation (2013-04-16 18:47:22 +0900)

----------------------------------------------------------------
Alexandre Courbot (18):
       mips: remove redundant GENERIC_GPIO select
       mips: loongson: use GPIO driver on CONFIG_GPIOLIB
       mips: txx9: change GENERIC_GPIO to GPIOLIB
       mips: alchemy: require gpiolib
       arm: remove redundant GENERIC_GPIO selection
       arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB
       unicore32: remove unneeded select GENERIC_GPIO
       unicore32: default GENERIC_GPIO to false
       powerpc: remove redundant GENERIC_GPIO selection
       sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
       xtensa: remove explicit selection of GENERIC_GPIO
       avr32: default GENERIC_GPIO to false
       openrisc: default GENERIC_GPIO to false
       mips: pnx833x: remove requirement for GENERIC_GPIO
       m68k: coldfire: use gpiolib
       blackfin: force use of gpiolib
       Convert selectors of GENERIC_GPIO to GPIOLIB
       Remove GENERIC_GPIO config option

Chen Baozi (1):
       gpio: update gpio Chinese documentation

  Documentation/gpio.txt               | 10 +++++-----
  Documentation/zh_CN/gpio.txt         |  8 ++++----
  arch/alpha/Kconfig                   |  3 ---
  arch/arm/Kconfig                     |  3 ---
  arch/arm/plat-orion/Makefile         |  2 +-
  arch/arm/plat-orion/gpio.c           |  2 +-
  arch/arm64/Kconfig                   |  3 ---
  arch/avr32/Kconfig                   |  3 ---
  arch/blackfin/Kconfig                |  5 +----
  arch/hexagon/Kconfig                 |  3 ---
  arch/ia64/Kconfig                    |  3 ---
  arch/m68k/Kconfig                    |  3 ---
  arch/m68k/Kconfig.cpu                |  3 +--
  arch/metag/Kconfig                   |  3 ---
  arch/microblaze/Kconfig              |  3 ---
  arch/mips/Kconfig                    | 10 +---------
  arch/mips/loongson/common/Makefile   |  2 +-
  arch/mips/txx9/generic/setup.c       |  2 +-
  arch/openrisc/Kconfig                |  3 ---
  arch/powerpc/Kconfig                 |  5 -----
  arch/powerpc/platforms/40x/Kconfig   |  1 -
  arch/powerpc/platforms/44x/Kconfig   |  1 -
  arch/powerpc/platforms/85xx/Kconfig  |  1 -
  arch/powerpc/platforms/86xx/Kconfig  |  3 ---
  arch/powerpc/platforms/8xx/Kconfig   |  1 -
  arch/powerpc/platforms/Kconfig       |  4 ----
  arch/sh/Kconfig                      |  3 ---
  arch/sh/boards/mach-sdk7786/Makefile |  2 +-
  arch/sh/boards/mach-x3proto/Makefile |  2 +-
  arch/sh/kernel/cpu/sh2a/Makefile     |  2 +-
  arch/sh/kernel/cpu/sh3/Makefile      |  2 +-
  arch/sh/kernel/cpu/sh4a/Makefile     |  2 +-
  arch/sparc/Kconfig                   |  5 -----
  arch/unicore32/Kconfig               |  6 +-----
  arch/x86/Kconfig                     |  3 ---
  arch/xtensa/Kconfig                  |  3 ---
  arch/xtensa/configs/iss_defconfig    |  1 -
  arch/xtensa/configs/s6105_defconfig  |  1 -
  drivers/extcon/Kconfig               |  2 +-
  drivers/gpio/Kconfig                 |  1 -
  drivers/gpio/gpio-lpc32xx.c          |  2 +-
  drivers/i2c/busses/Kconfig           |  4 ++--
  drivers/i2c/muxes/Kconfig            |  2 +-
  drivers/input/keyboard/Kconfig       |  6 +++---
  drivers/input/misc/Kconfig           |  8 ++++----
  drivers/input/mouse/Kconfig          |  2 +-
  drivers/leds/Kconfig                 |  6 +++---
  drivers/mtd/maps/Kconfig             |  2 +-
  drivers/mtd/nand/Kconfig             |  2 +-
  drivers/net/phy/Kconfig              |  2 +-
  drivers/pinctrl/sh-pfc/Kconfig       | 26 +++++++++++++-------------
  drivers/regulator/Kconfig            |  2 +-
  drivers/spi/Kconfig                  |  8 ++++----
  drivers/staging/android/Kconfig      |  2 +-
  drivers/staging/iio/accel/Kconfig    |  2 +-
  drivers/staging/iio/adc/Kconfig      |  2 +-
  drivers/staging/iio/addac/Kconfig    |  2 +-
  drivers/staging/iio/resolver/Kconfig |  4 ++--
  drivers/staging/iio/trigger/Kconfig  |  2 +-
  drivers/usb/otg/Kconfig              |  2 +-
  drivers/video/Kconfig                |  2 +-
  drivers/video/backlight/Kconfig      |  4 ++--
  drivers/w1/masters/Kconfig           |  2 +-
  include/linux/gpio.h                 |  6 +++---
  64 files changed, 74 insertions(+), 153 deletions(-)

Re: [GIT PULL] Removal of GENERIC_GPIO

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1586 bytes --]

Hi Grant,

On Thu, 2 May 2013 19:20:10 +0900 Alex Courbot <acourbot@nvidia.com> wrote:
>
> Here is the pull request for the GENERIC_GPIO removal. It is almost 
> certain that a few fixups will be necessary - while I don't have precise 
> patches, the following steps should ensure the state of the code is clean:
> 
> * "git grep CONFIG_GENERIC_GPIO" should return 0 hits. Matches should be 
> replaced with CONFIG_GPIOLIB
> * "git grep '\bGENERIC_GPIO\b'" should return 1 hit in the Chinese 
> documentation. Selectors of GENERIC_GPIO should be turned into selectors 
> of GPIOLIB, while definitions of the option in architecture code should 
> be deleted.
> 
> Please let me know if there is something more I can do to ease your task.
> 
> Thanks,
> Alex.
> 
> The following changes since commit 10b38669d64c757cfd927e3820292c580ed70aae:
> 
>    Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs 
> (2013-03-19 15:17:40 -0700)
> 
> are available in the git repository at:
> 
>    git://github.com/Gnurou/linux.git for_grant
> 
> for you to fetch changes up to f4c54050640e7afa4749875cf9b900d42db361c0:
> 
>    gpio: update gpio Chinese documentation (2013-04-16 18:47:22 +0900)

I currently have 3 merge fix patches for the gen-cpio tree:

gen-gpio: GPIOLIB merge fix up
merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB
merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB

I have attached them.  All three are now applicable to Linus' tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gen-gpio-GPIOLIB-merge-fix-up.patch --]
[-- Type: text/x-diff; name="0001-gen-gpio-GPIOLIB-merge-fix-up.patch", Size: 835 bytes --]

From 0cde69807ded83d280745b4d576d587c4bd9f16b Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Apr 2013 15:44:53 +1000
Subject: [PATCH] gen-gpio: GPIOLIB merge fix up

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/usb/phy/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 3a7fec9..21153d1 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -128,7 +128,7 @@ config TWL6030_USB
 
 config USB_GPIO_VBUS
 	tristate "GPIO based peripheral-only VBUS sensing 'transceiver'"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Provides simple GPIO VBUS sensing for controllers with an
 	  internal transceiver via the usb_phy interface, and
-- 
1.8.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0001-merge-fix-for-Convert-selectors-of-GENERIC_GPIO-to-G.patch --]
[-- Type: text/x-diff; name="0001-merge-fix-for-Convert-selectors-of-GENERIC_GPIO-to-G.patch", Size: 793 bytes --]

From aa67afd7caf9abff0bff965f95bf4dd0f04fc180 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Apr 2013 17:05:12 +1000
Subject: [PATCH] merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/platforms/85xx/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index fbb3eb9..102c29e 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -327,7 +327,6 @@ config B4_QDS
 	select PPC_E500MC
 	select PHYS_64BIT
 	select SWIOTLB
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select HAS_RAPIDIO
 	select PPC_EPAPR_HV_PIC
-- 
1.8.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0001-merge-fix-2-for-Convert-selectors-of-GENERIC_GPIO-to.patch --]
[-- Type: text/x-diff; name="0001-merge-fix-2-for-Convert-selectors-of-GENERIC_GPIO-to.patch", Size: 900 bytes --]

From fca3f55cd845c7640ef80e85a169fa7225bfd8ed Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Apr 2013 17:08:14 +1000
Subject: [PATCH] merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/i2c/muxes/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index b5329b0..f7f9865 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -7,7 +7,7 @@ menu "Multiplexer I2C Chip support"
 
 config I2C_ARB_GPIO_CHALLENGE
 	tristate "GPIO-based I2C arbitration"
-	depends on GENERIC_GPIO && OF
+	depends on GPIOLIB && OF
 	help
 	  If you say yes to this option, support will be included for an
 	  I2C multimaster arbitration scheme using GPIOs and a challenge &
-- 
1.8.1


[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [GIT PULL] Removal of GENERIC_GPIO

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 682 bytes --]

Hi Guys,

On Fri, 3 May 2013 10:52:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I currently have 3 merge fix patches for the gen-cpio tree:
> 
> gen-gpio: GPIOLIB merge fix up
> merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB
> merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB
> 
> I have attached them.  All three are now applicable to Linus' tree.

Just to absolutely clear, I *do not* expect either of you to rebase your
trees or backmerge Linus' tree to fix these, I *do* expect whoever send
this stuff to Linus to mention the necessary fixes to him.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [GIT PULL] Removal of GENERIC_GPIO

[Grant Likely]

On Fri, May 3, 2013 at 2:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Guys,
>
> On Fri, 3 May 2013 10:52:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> I currently have 3 merge fix patches for the gen-cpio tree:
>>
>> gen-gpio: GPIOLIB merge fix up
>> merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB
>> merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB
>>
>> I have attached them.  All three are now applicable to Linus' tree.
>
> Just to absolutely clear, I *do not* expect either of you to rebase your
> trees or backmerge Linus' tree to fix these, I *do* expect whoever send
> this stuff to Linus to mention the necessary fixes to him.

Yes, that is exactly what I'm going to do

g.