Hi Grant, On Thu, 2 May 2013 19:20:10 +0900 Alex Courbot <acourbot@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
>From 0cde69807ded83d280745b4d576d587c4bd9f16b Mon Sep 17 00:00:00 2001 From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Wed, 17 Apr 2013 15:44:53 +1000 Subject: [PATCH] gen-gpio: GPIOLIB merge fix up Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- 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
>From aa67afd7caf9abff0bff965f95bf4dd0f04fc180 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> --- 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
>From fca3f55cd845c7640ef80e85a169fa7225bfd8ed Mon Sep 17 00:00:00 2001 From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> --- 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:
pgp8aIH_PZ8r3.pgp
Description: PGP signature
