public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCH 0/3] gpio: remove GENERIC_GPIO completely
@ 2013-03-29 13:11 Alexandre Courbot
  2013-03-29 13:11 ` [PATCH 1/3] Convert selectors of GENERIC_GPIO to GPIOLIB Alexandre Courbot
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Alexandre Courbot @ 2013-03-29 13:11 UTC (permalink / raw)
  To: linux-arm-kernel

Since I have received no death threat from architecture maintainers I'd like to 
proceed with the remainder of this work so that it doesn't go half-baked into 
3.10. These three patches finish the removal of the GENERIC_GPIO config option 
which has been made equivalent to GPIOLIB in the previous series. It does so by 
first changing all references to GENERIC_GPIO into GPIOLIB in driver code and
configuration files, and then removing the unused option from the Kconfig files
where it is declared.

The last patch in the series confirms gpiolib in its new role as GPIO framework 
by renaming CONFIG_GPIOLIB into CONFIG_GPIO, following the model used by other 
frameworks. This name changing might rise concern but it seems more logical to 
me and the historical gpiolib name is still mentioned in the documentation to 
relieve the confusion.

If I can get a few acks on these (or at least the first two ones) I'd like to 
include them into my next branch as soon as possible so points of breakage can 
be fixed. There are indeed a few new users of GENERIC_GPIO (CC Romain, I sent a 
warning but saw no action so far) in the next tree and compilation will break 
for them.

Another issue, I could not update the Chinese documentation in a satisfying
manner due to my absence of Chinese skills. Hope that will be forgiven.

Alexandre Courbot (3):
  Convert selectors of GENERIC_GPIO to GPIOLIB
  Remove GENERIC_GPIO config option
  Rename CONFIG_GPIOLIB to CONFIG_GPIO

 Documentation/gpio.txt                            | 51 ++++++++---------
 Documentation/zh_CN/gpio.txt                      |  6 +-
 arch/alpha/Kconfig                                |  5 +-
 arch/arm/Kconfig                                  | 67 +++++++++++------------
 arch/arm/configs/kzm9d_defconfig                  |  2 +-
 arch/arm/configs/mvebu_defconfig                  |  2 +-
 arch/arm/configs/realview-smp_defconfig           |  2 +-
 arch/arm/configs/realview_defconfig               |  2 +-
 arch/arm/mach-bcm/Kconfig                         |  2 +-
 arch/arm/mach-highbank/Kconfig                    |  2 +-
 arch/arm/mach-imx/Kconfig                         |  2 +-
 arch/arm/mach-omap2/Kconfig                       |  2 +-
 arch/arm/mach-picoxcell/Kconfig                   |  2 +-
 arch/arm/mach-s3c24xx/Kconfig                     |  2 +-
 arch/arm/mach-shmobile/Kconfig                    | 26 ++++-----
 arch/arm/mach-socfpga/Kconfig                     |  4 +-
 arch/arm/mach-vexpress/Kconfig                    |  2 +-
 arch/arm/mach-virt/Kconfig                        |  2 +-
 arch/arm/mach-vt8500/Kconfig                      |  2 +-
 arch/arm/plat-orion/Makefile                      |  2 +-
 arch/arm/plat-orion/gpio.c                        |  2 +-
 arch/arm/plat-samsung/Kconfig                     |  2 +-
 arch/arm64/Kconfig                                |  5 +-
 arch/avr32/Kconfig                                |  5 +-
 arch/blackfin/Kconfig                             |  5 +-
 arch/blackfin/configs/BF518F-EZBRD_defconfig      |  2 +-
 arch/blackfin/configs/BF526-EZBRD_defconfig       |  2 +-
 arch/blackfin/configs/BF527-AD7160-EVAL_defconfig |  2 +-
 arch/blackfin/configs/BF527-EZKIT-V2_defconfig    |  2 +-
 arch/blackfin/configs/BF527-EZKIT_defconfig       |  2 +-
 arch/blackfin/configs/BF527-TLL6527M_defconfig    |  2 +-
 arch/blackfin/configs/BF533-EZKIT_defconfig       |  2 +-
 arch/blackfin/configs/BF533-STAMP_defconfig       |  2 +-
 arch/blackfin/configs/BF537-STAMP_defconfig       |  2 +-
 arch/blackfin/configs/BF538-EZKIT_defconfig       |  2 +-
 arch/blackfin/configs/BF548-EZKIT_defconfig       |  2 +-
 arch/blackfin/configs/BF561-ACVILON_defconfig     |  2 +-
 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig   |  2 +-
 arch/blackfin/configs/BF561-EZKIT_defconfig       |  2 +-
 arch/blackfin/configs/BF609-EZKIT_defconfig       |  2 +-
 arch/blackfin/configs/CM-BF527_defconfig          |  2 +-
 arch/blackfin/configs/CM-BF537E_defconfig         |  2 +-
 arch/blackfin/configs/CM-BF537U_defconfig         |  2 +-
 arch/blackfin/configs/CM-BF561_defconfig          |  2 +-
 arch/blackfin/configs/DNP5370_defconfig           |  2 +-
 arch/blackfin/configs/TCM-BF518_defconfig         |  2 +-
 arch/blackfin/include/asm/gpio.h                  |  6 +-
 arch/blackfin/kernel/bfin_gpio.c                  |  2 +-
 arch/blackfin/mach-bf538/Makefile                 |  2 +-
 arch/blackfin/mach-bf538/include/mach/gpio.h      |  2 +-
 arch/hexagon/Kconfig                              |  7 +--
 arch/ia64/Kconfig                                 |  5 +-
 arch/m68k/Kconfig                                 |  3 -
 arch/m68k/Kconfig.cpu                             |  2 +-
 arch/m68k/include/asm/mcfgpio.h                   |  4 +-
 arch/m68k/platform/coldfire/gpio.c                |  2 +-
 arch/metag/Kconfig                                |  3 -
 arch/microblaze/Kconfig                           |  5 +-
 arch/microblaze/configs/mmu_defconfig             |  2 +-
 arch/microblaze/configs/nommu_defconfig           |  2 +-
 arch/microblaze/kernel/reset.c                    |  2 +-
 arch/mips/Kconfig                                 | 25 ++++-----
 arch/mips/alchemy/Kconfig                         |  2 +-
 arch/mips/alchemy/common/Makefile                 |  2 +-
 arch/mips/alchemy/common/gpiolib.c                |  2 +-
 arch/mips/bcm47xx/Kconfig                         |  4 +-
 arch/mips/configs/db1000_defconfig                |  2 +-
 arch/mips/configs/gpr_defconfig                   |  2 +-
 arch/mips/configs/mtx1_defconfig                  |  2 +-
 arch/mips/include/asm/mach-au1x00/gpio-au1000.h   |  4 +-
 arch/mips/include/asm/mach-au1x00/gpio-au1300.h   |  2 +-
 arch/mips/include/asm/mach-au1x00/gpio.h          |  8 +--
 arch/mips/include/asm/mach-generic/gpio.h         |  2 +-
 arch/mips/loongson/common/Makefile                |  2 +-
 arch/mips/txx9/generic/setup.c                    |  2 +-
 arch/openrisc/Kconfig                             |  5 +-
 arch/powerpc/Kconfig                              |  7 +--
 arch/powerpc/configs/40x/virtex_defconfig         |  2 +-
 arch/powerpc/configs/44x/virtex5_defconfig        |  2 +-
 arch/powerpc/configs/mpc512x_defconfig            |  2 +-
 arch/powerpc/configs/wii_defconfig                |  2 +-
 arch/powerpc/platforms/40x/Kconfig                |  2 +-
 arch/powerpc/platforms/44x/Kconfig                |  2 +-
 arch/powerpc/platforms/512x/Kconfig               |  2 +-
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c         |  8 +--
 arch/powerpc/platforms/83xx/Kconfig               |  6 +-
 arch/powerpc/platforms/85xx/Kconfig               | 14 ++---
 arch/powerpc/platforms/86xx/Kconfig               |  8 +--
 arch/powerpc/platforms/8xx/Kconfig                |  2 +-
 arch/powerpc/platforms/Kconfig                    |  8 +--
 arch/sh/Kconfig                                   | 23 ++++----
 arch/sh/boards/Kconfig                            | 18 +++---
 arch/sh/boards/mach-highlander/Kconfig            |  2 +-
 arch/sh/boards/mach-rsk/Kconfig                   |  6 +-
 arch/sh/boards/mach-sdk7786/Makefile              |  2 +-
 arch/sh/boards/mach-x3proto/Makefile              |  2 +-
 arch/sh/include/asm/gpio.h                        |  4 +-
 arch/sh/kernel/cpu/sh2a/Makefile                  |  2 +-
 arch/sh/kernel/cpu/sh3/Makefile                   |  2 +-
 arch/sh/kernel/cpu/sh4a/Makefile                  |  2 +-
 arch/sparc/Kconfig                                |  7 +--
 arch/unicore32/Kconfig                            |  7 +--
 arch/x86/Kconfig                                  | 15 ++---
 arch/xtensa/Kconfig                               |  7 +--
 arch/xtensa/configs/s6105_defconfig               |  4 +-
 drivers/bcma/Kconfig                              |  2 +-
 drivers/block/Kconfig                             |  2 +-
 drivers/char/tpm/Kconfig                          |  2 +-
 drivers/extcon/Kconfig                            |  2 +-
 drivers/gpio/Kconfig                              | 19 +++----
 drivers/gpio/Makefile                             |  2 +-
 drivers/gpio/gpio-lpc32xx.c                       |  2 +-
 drivers/hwmon/Kconfig                             |  4 +-
 drivers/i2c/busses/Kconfig                        |  4 +-
 drivers/i2c/muxes/Kconfig                         |  2 +-
 drivers/input/keyboard/Kconfig                    |  6 +-
 drivers/input/keyboard/adp5588-keys.c             |  4 +-
 drivers/input/keyboard/adp5589-keys.c             |  4 +-
 drivers/input/misc/Kconfig                        |  8 +--
 drivers/input/mouse/Kconfig                       |  2 +-
 drivers/input/touchscreen/Kconfig                 |  4 +-
 drivers/input/touchscreen/ad7879.c                |  4 +-
 drivers/leds/Kconfig                              | 10 ++--
 drivers/leds/leds-tca6507.c                       |  8 +--
 drivers/media/dvb-frontends/cxd2820r_core.c       |  6 +-
 drivers/media/dvb-frontends/cxd2820r_priv.h       |  2 +-
 drivers/media/radio/wl128x/Kconfig                |  2 +-
 drivers/media/usb/em28xx/em28xx-dvb.c             |  4 +-
 drivers/mfd/Kconfig                               | 26 ++++-----
 drivers/misc/ti-st/Kconfig                        |  2 +-
 drivers/mtd/maps/Kconfig                          |  2 +-
 drivers/mtd/nand/Kconfig                          |  2 +-
 drivers/net/phy/Kconfig                           |  2 +-
 drivers/pinctrl/Kconfig                           |  4 +-
 drivers/pinctrl/sh-pfc/Kconfig                    | 30 +++++-----
 drivers/pinctrl/spear/Kconfig                     |  2 +-
 drivers/platform/x86/Kconfig                      |  2 +-
 drivers/power/Kconfig                             |  2 +-
 drivers/regulator/Kconfig                         |  2 +-
 drivers/spi/Kconfig                               |  8 +--
 drivers/ssb/Kconfig                               |  2 +-
 drivers/staging/android/Kconfig                   |  2 +-
 drivers/staging/cptm1217/Kconfig                  |  2 +-
 drivers/staging/iio/accel/Kconfig                 |  2 +-
 drivers/staging/iio/adc/Kconfig                   |  6 +-
 drivers/staging/iio/addac/Kconfig                 |  2 +-
 drivers/staging/iio/magnetometer/Kconfig          |  2 +-
 drivers/staging/iio/resolver/Kconfig              |  4 +-
 drivers/staging/iio/trigger/Kconfig               |  2 +-
 drivers/staging/nvec/Kconfig                      |  2 +-
 drivers/staging/vme/devices/Kconfig               |  2 +-
 drivers/tty/serial/Kconfig                        |  2 +-
 drivers/tty/serial/max310x.c                      |  8 +--
 drivers/usb/otg/Kconfig                           |  2 +-
 drivers/video/Kconfig                             |  4 +-
 drivers/video/backlight/Kconfig                   |  4 +-
 drivers/w1/masters/Kconfig                        |  2 +-
 include/asm-generic/gpio.h                        |  6 +-
 include/linux/gpio.h                              |  6 +-
 include/linux/leds-tca6507.h                      |  2 +-
 include/linux/spi/ad7879.h                        |  2 +-
 include/sound/soc.h                               |  6 +-
 net/rfkill/Kconfig                                |  2 +-
 sound/soc/codecs/wm5100.c                         |  4 +-
 sound/soc/codecs/wm8903.c                         |  4 +-
 sound/soc/codecs/wm8962.c                         |  4 +-
 sound/soc/codecs/wm8996.c                         |  4 +-
 sound/soc/soc-jack.c                              |  4 +-
 168 files changed, 375 insertions(+), 441 deletions(-)

-- 
1.8.2

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] Convert selectors of GENERIC_GPIO to GPIOLIB
  2013-03-29 13:11 [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alexandre Courbot
@ 2013-03-29 13:11 ` Alexandre Courbot
  2013-03-29 13:11 ` [PATCH 2/3] Remove GENERIC_GPIO config option Alexandre Courbot
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Alexandre Courbot @ 2013-03-29 13:11 UTC (permalink / raw)
  To: linux-arm-kernel

GENERIC_GPIO is now equivalent to GPIOLIB and features that depended on
GENERIC_GPIO can now depend on GPIOLIB to allow removal of this option.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
 arch/unicore32/Kconfig               |  2 +-
 drivers/extcon/Kconfig               |  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 +++---
 25 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 63521dc..468cd70 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -156,7 +156,7 @@ source "mm/Kconfig"
 
 config LEDS
 	def_bool y
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 
 config ALIGNMENT_TRAP
 	def_bool y
diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 5168a13..3297301 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -16,7 +16,7 @@ comment "Extcon Device Drivers"
 
 config EXTCON_GPIO
 	tristate "GPIO extcon support"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say Y here to enable GPIO based extcon support. Note that GPIO
 	  extcon supports single state per extcon instance.
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index adfee98..631736e 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -363,7 +363,7 @@ config I2C_BLACKFIN_TWI_CLK_KHZ
 
 config I2C_CBUS_GPIO
 	tristate "CBUS I2C driver"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Support for CBUS access using I2C API. Mostly relevant for Nokia
 	  Internet Tablets (770, N800 and N810).
@@ -436,7 +436,7 @@ config I2C_EG20T
 
 config I2C_GPIO
 	tristate "GPIO-based bitbanging I2C"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select I2C_ALGOBIT
 	help
 	  This is a very simple bitbanging I2C driver utilizing the
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 0be5b83..40062ed 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -7,7 +7,7 @@ menu "Multiplexer I2C Chip support"
 
 config I2C_MUX_GPIO
 	tristate "GPIO-based I2C multiplexer"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  If you say yes to this option, support will be included for a
 	  GPIO based I2C multiplexer. This driver provides access to
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ac05006..772666f 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -175,7 +175,7 @@ config KEYBOARD_EP93XX
 
 config KEYBOARD_GPIO
 	tristate "GPIO Buttons"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  This driver implements support for buttons connected
 	  to GPIO pins of various CPUs (and some other chips).
@@ -190,7 +190,7 @@ config KEYBOARD_GPIO
 
 config KEYBOARD_GPIO_POLLED
 	tristate "Polled GPIO buttons"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select INPUT_POLLDEV
 	help
 	  This driver implements support for buttons connected
@@ -241,7 +241,7 @@ config KEYBOARD_TCA8418
 
 config KEYBOARD_MATRIX
 	tristate "GPIO driven matrix keypad support"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select INPUT_MATRIXKMAP
 	help
 	  Enable support for GPIO driven matrix keypad.
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 259ef31..262cda2 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -214,7 +214,7 @@ config INPUT_APANEL
 config INPUT_GP2A
 	tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"
 	depends on I2C
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip
 	  hooked to an I2C bus.
@@ -224,7 +224,7 @@ config INPUT_GP2A
 
 config INPUT_GPIO_TILT_POLLED
 	tristate "Polled GPIO tilt switch"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select INPUT_POLLDEV
 	help
 	  This driver implements support for tilt switches connected
@@ -472,7 +472,7 @@ config INPUT_PWM_BEEPER
 
 config INPUT_GPIO_ROTARY_ENCODER
 	tristate "Rotary encoders connected to GPIO pins"
-	depends on GPIOLIB && GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say Y here to add support for rotary encoders connected to GPIO lines.
 	  Check file:Documentation/input/rotary-encoder.txt for more
@@ -484,7 +484,7 @@ config INPUT_GPIO_ROTARY_ENCODER
 config INPUT_RB532_BUTTON
 	tristate "Mikrotik Routerboard 532 button interface"
 	depends on MIKROTIK_RB532
-	depends on GPIOLIB && GENERIC_GPIO
+	depends on GPIOLIB
 	select INPUT_POLLDEV
 	help
 	  Say Y here if you want support for the S1 button built into
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 802bd6a..effa9c5 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -295,7 +295,7 @@ config MOUSE_VSXXXAA
 
 config MOUSE_GPIO
 	tristate "GPIO mouse"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select INPUT_POLLDEV
 	help
 	  This driver simulates a mouse on GPIO lines of various CPUs (and some
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index ec50824..2a53177 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -173,7 +173,7 @@ config LEDS_PCA9532_GPIO
 config LEDS_GPIO
 	tristate "LED Support for GPIO connected LEDs"
 	depends on LEDS_CLASS
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  This option enables support for the LEDs connected to GPIO
 	  outputs. To be useful the particular board must have LEDs
@@ -352,7 +352,7 @@ config LEDS_INTEL_SS4200
 config LEDS_LT3593
 	tristate "LED driver for LT3593 controllers"
 	depends on LEDS_CLASS
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  This option enables support for LEDs driven by a Linear Technology
 	  LT3593 controller. This controller uses a special one-wire pulse
@@ -421,7 +421,7 @@ config LEDS_ASIC3
 
 config LEDS_RENESAS_TPU
 	bool "LED support for Renesas TPU"
-	depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO
+	depends on LEDS_CLASS=y && HAVE_CLK && GPIOLIB
 	help
 	  This option enables build of the LED TPU platform driver,
 	  suitable to drive any TPU channel on newer Renesas SoCs.
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 3ed17c4..c269383 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -419,7 +419,7 @@ config MTD_BFIN_ASYNC
 
 config MTD_GPIO_ADDR
 	tristate "GPIO-assisted Flash Chip Support"
-	depends on GENERIC_GPIO || GPIOLIB
+	depends on GPIOLIB
 	depends on MTD_COMPLEX_MAPPINGS
 	help
 	  Map driver which allows flashes to be partially physically addressed
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 81bf5e5..5d54ad3 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -89,7 +89,7 @@ config MTD_NAND_H1900
 
 config MTD_NAND_GPIO
 	tristate "GPIO NAND Flash driver"
-	depends on GENERIC_GPIO && ARM
+	depends on GPIOLIB && ARM
 	help
 	  This enables a GPIO based NAND flash driver.
 
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 4503452..1e11f2b 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -126,7 +126,7 @@ config MDIO_BITBANG
 
 config MDIO_GPIO
 	tristate "Support for GPIO lib-based bitbanged MDIO buses"
-	depends on MDIO_BITBANG && GENERIC_GPIO
+	depends on MDIO_BITBANG && GPIOLIB
 	---help---
 	  Supports GPIO lib-based MDIO busses.
 
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index c3340f5..99ba8e4 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -6,7 +6,7 @@ if ARCH_SHMOBILE || SUPERH
 
 config PINCTRL_SH_PFC
 	# XXX move off the gpio dependency
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
 	select PINMUX
 	select PINCONF
@@ -34,19 +34,19 @@ config PINCTRL_PFC_R8A7779
 config PINCTRL_PFC_SH7203
 	def_bool y
 	depends on CPU_SUBTYPE_SH7203
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7264
 	def_bool y
 	depends on CPU_SUBTYPE_SH7264
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7269
 	def_bool y
 	depends on CPU_SUBTYPE_SH7269
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7372
@@ -62,55 +62,55 @@ config PINCTRL_PFC_SH73A0
 config PINCTRL_PFC_SH7720
 	def_bool y
 	depends on CPU_SUBTYPE_SH7720
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7722
 	def_bool y
 	depends on CPU_SUBTYPE_SH7722
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7723
 	def_bool y
 	depends on CPU_SUBTYPE_SH7723
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7724
 	def_bool y
 	depends on CPU_SUBTYPE_SH7724
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7734
 	def_bool y
 	depends on CPU_SUBTYPE_SH7734
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7757
 	def_bool y
 	depends on CPU_SUBTYPE_SH7757
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7785
 	def_bool y
 	depends on CPU_SUBTYPE_SH7785
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SH7786
 	def_bool y
 	depends on CPU_SUBTYPE_SH7786
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_SHX3
 	def_bool y
 	depends on CPU_SUBTYPE_SHX3
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select PINCTRL_SH_PFC
 
 endif
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index a5d97ea..8bb2644 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -66,7 +66,7 @@ config REGULATOR_USERSPACE_CONSUMER
 
 config REGULATOR_GPIO
 	tristate "GPIO regulator support"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  This driver provides support for regulators that can be
 	  controlled via gpios.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index f80eee7..134b6f3 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -61,7 +61,7 @@ config SPI_ALTERA
 
 config SPI_ATH79
 	tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
-	depends on ATH79 && GENERIC_GPIO
+	depends on ATH79 && GPIOLIB
 	select SPI_BITBANG
 	help
 	  This enables support for the SPI controller present on the
@@ -163,7 +163,7 @@ config SPI_FALCON
 
 config SPI_GPIO
 	tristate "GPIO-based bitbanging SPI Master"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select SPI_BITBANG
 	help
 	  This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
@@ -240,7 +240,7 @@ config SPI_FSL_ESPI
 
 config SPI_OC_TINY
 	tristate "OpenCores tiny SPI"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select SPI_BITBANG
 	help
 	  This is the driver for OpenCores tiny SPI master controller.
@@ -430,7 +430,7 @@ config SPI_TOPCLIFF_PCH
 
 config SPI_TXX9
 	tristate "Toshiba TXx9 SPI controller"
-	depends on GENERIC_GPIO && CPU_TX49XX
+	depends on GPIOLIB && CPU_TX49XX
 	help
 	  SPI driver for Toshiba TXx9 MIPS SoCs
 
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 465a28c..9feb6ff 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -54,7 +54,7 @@ config ANDROID_TIMED_OUTPUT
 
 config ANDROID_TIMED_GPIO
 	tristate "Android timed gpio driver"
-	depends on GENERIC_GPIO && ANDROID_TIMED_OUTPUT
+	depends on GPIOLIB && ANDROID_TIMED_OUTPUT
 	default n
 
 config ANDROID_LOW_MEMORY_KILLER
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index e2e786d..ad45dfb 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -61,7 +61,7 @@ config LIS3L02DQ
 	depends on SPI
 	select IIO_TRIGGER if IIO_BUFFER
 	depends on !IIO_BUFFER || IIO_KFIFO_BUF
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say yes here to build SPI support for the ST microelectronics
 	  accelerometer. The driver supplies direct access via sysfs files
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 7b2a01d..a48eee1 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -73,7 +73,7 @@ config AD7780
 config AD7816
 	tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
 	depends on SPI
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say yes here to build support for Analog Devices AD7816/7/8
 	  temperature sensors and ADC.
diff --git a/drivers/staging/iio/addac/Kconfig b/drivers/staging/iio/addac/Kconfig
index 698a897..e6795e0 100644
--- a/drivers/staging/iio/addac/Kconfig
+++ b/drivers/staging/iio/addac/Kconfig
@@ -5,7 +5,7 @@ menu "Analog digital bi-direction converters"
 
 config ADT7316
 	tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318
 	  and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC.
diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig
index 49f69ef..ce360f1 100644
--- a/drivers/staging/iio/resolver/Kconfig
+++ b/drivers/staging/iio/resolver/Kconfig
@@ -13,7 +13,7 @@ config AD2S90
 config AD2S1200
 	tristate "Analog Devices ad2s1200/ad2s1205 driver"
 	depends on SPI
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say yes here to build support for Analog Devices spi resolver
 	  to digital converters, ad2s1200 and ad2s1205, provides direct access
@@ -22,7 +22,7 @@ config AD2S1200
 config AD2S1210
 	tristate "Analog Devices ad2s1210 driver"
 	depends on SPI
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say yes here to build support for Analog Devices spi resolver
 	  to digital converters, ad2s1210, provides direct access via sysfs.
diff --git a/drivers/staging/iio/trigger/Kconfig b/drivers/staging/iio/trigger/Kconfig
index d44d3ad..1a051da 100644
--- a/drivers/staging/iio/trigger/Kconfig
+++ b/drivers/staging/iio/trigger/Kconfig
@@ -14,7 +14,7 @@ config IIO_PERIODIC_RTC_TRIGGER
 
 config IIO_GPIO_TRIGGER
 	tristate "GPIO trigger"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Provides support for using GPIO pins as IIO triggers.
 
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 37962c9..8377868 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -19,7 +19,7 @@ if USB || USB_GADGET
 #
 config USB_GPIO_VBUS
 	tristate "GPIO based peripheral-only VBUS sensing 'transceiver'"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select USB_OTG_UTILS
 	help
 	  Provides simple GPIO VBUS sensing for controllers with an
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4c1546f..df9c738 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2481,7 +2481,7 @@ config FB_SSD1307
 	tristate "Solomon SSD1307 framebuffer support"
 	depends on FB && I2C
 	depends on OF
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	select FB_SYS_FOPS
 	select FB_SYS_FILLRECT
 	select FB_SYS_COPYAREA
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index db10d01..b83d155 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -36,14 +36,14 @@ config LCD_CORGI
 
 config LCD_L4F00242T03
 	tristate "Epson L4F00242T03 LCD"
-	depends on SPI_MASTER && GENERIC_GPIO
+	depends on SPI_MASTER && GPIOLIB
 	help
 	  SPI driver for Epson L4F00242T03. This provides basic support
 	  for init and powering the LCD up/down through a sysfs interface.
 
 config LCD_LMS283GF05
 	tristate "Samsung LMS283GF05 LCD"
-	depends on SPI_MASTER && GENERIC_GPIO
+	depends on SPI_MASTER && GPIOLIB
 	help
 	  SPI driver for Samsung LMS283GF05. This provides basic support
 	  for powering the LCD up/down through a sysfs interface.
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index e8ca63a..2bd1257 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -50,7 +50,7 @@ config W1_MASTER_DS1WM
 
 config W1_MASTER_GPIO
 	tristate "GPIO 1-wire busmaster"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  Say Y here if you want to communicate with your 1-wire devices using
 	  GPIO pins. This driver uses the GPIO API to control the wire.
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index f6c7ae3..552e3f4 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -39,7 +39,7 @@ struct gpio {
 	const char	*label;
 };
 
-#ifdef CONFIG_GENERIC_GPIO
+#ifdef CONFIG_GPIOLIB
 
 #ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H
 #include <asm/gpio.h>
@@ -74,7 +74,7 @@ static inline int irq_to_gpio(unsigned int irq)
 
 #endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
 
-#else /* ! CONFIG_GENERIC_GPIO */
+#else /* ! CONFIG_GPIOLIB */
 
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -226,7 +226,7 @@ gpiochip_remove_pin_ranges(struct gpio_chip *chip)
 	WARN_ON(1);
 }
 
-#endif /* ! CONFIG_GENERIC_GPIO */
+#endif /* ! CONFIG_GPIOLIB */
 
 struct device;
 
-- 
1.8.2

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/3] Remove GENERIC_GPIO config option
  2013-03-29 13:11 [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alexandre Courbot
  2013-03-29 13:11 ` [PATCH 1/3] Convert selectors of GENERIC_GPIO to GPIOLIB Alexandre Courbot
@ 2013-03-29 13:11 ` Alexandre Courbot
  2013-03-29 15:24 ` [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alex Courbot
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Alexandre Courbot @ 2013-03-29 13:11 UTC (permalink / raw)
  To: linux-arm-kernel

GENERIC_GPIO has been made equivalent to GPIOLIB in architecture code
and all driver code has been switch to depend on GPIOLIB. It is thus
safe to have GENERIC_GPIO removed.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
 Documentation/gpio.txt      | 10 +++++-----
 arch/alpha/Kconfig          |  3 ---
 arch/arm/Kconfig            |  3 ---
 arch/arm/plat-orion/gpio.c  |  2 +-
 arch/arm64/Kconfig          |  3 ---
 arch/avr32/Kconfig          |  3 ---
 arch/blackfin/Kconfig       |  3 ---
 arch/hexagon/Kconfig        |  3 ---
 arch/ia64/Kconfig           |  3 ---
 arch/m68k/Kconfig           |  3 ---
 arch/metag/Kconfig          |  3 ---
 arch/microblaze/Kconfig     |  3 ---
 arch/mips/Kconfig           |  3 ---
 arch/openrisc/Kconfig       |  3 ---
 arch/powerpc/Kconfig        |  5 -----
 arch/sh/Kconfig             |  3 ---
 arch/sparc/Kconfig          |  5 -----
 arch/unicore32/Kconfig      |  3 ---
 arch/x86/Kconfig            |  3 ---
 arch/xtensa/Kconfig         |  3 ---
 drivers/gpio/Kconfig        |  1 -
 drivers/gpio/gpio-lpc32xx.c |  2 +-
 22 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index 77a1d11..6f83fa9 100644
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -72,11 +72,11 @@ in this document, but drivers acting as clients to the GPIO interface must
 not care how it's implemented.)
 
 That said, if the convention is supported on their platform, drivers should
-use it when possible.  Platforms must declare GENERIC_GPIO support in their
-Kconfig (boolean true), and provide an <asm/gpio.h> file.  Drivers that can't
-work without standard GPIO calls should have Kconfig entries which depend
-on GENERIC_GPIO.  The GPIO calls are available, either as "real code" or as
-optimized-away stubs, when drivers use the include file:
+use it when possible.  Platforms must select ARCH_REQUIRE_GPIOLIB or
+ARCH_WANT_OPTIONAL_GPIOLIB in their Kconfig.  Drivers that can't work without
+standard GPIO calls should have Kconfig entries which depend on GPIOLIB.  The
+GPIO calls are available, either as "real code" or as optimized-away stubs,
+when drivers use the include file:
 
 	#include <linux/gpio.h>
 
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8a33ba0..282ff37 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -56,9 +56,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config GENERIC_GPIO
-	bool
-
 config ZONE_DMA
 	bool
 	default y
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 13b7394..ceac9a4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -107,9 +107,6 @@ config MIGHT_HAVE_PCI
 config SYS_SUPPORTS_APM_EMULATION
 	bool
 
-config GENERIC_GPIO
-	bool
-
 config HAVE_TCM
 	bool
 	select GENERIC_ALLOCATOR
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index c29ee7e..59ddf4d 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -150,7 +150,7 @@ err_out:
 }
 
 /*
- * GENERIC_GPIO primitives.
+ * GPIO primitives.
  */
 static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
 {
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9b6d19f..e6e7007 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -92,9 +92,6 @@ config SWIOTLB
 config IOMMU_HELPER
 	def_bool SWIOTLB
 
-config GENERIC_GPIO
-	bool
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index d22c6b4..ff775b8 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -26,9 +26,6 @@ config AVR32
 	  There is an AVR32 Linux project with a web page at
 	  http://avr32linux.org/.
 
-config GENERIC_GPIO
-	def_bool n
-
 config STACKTRACE_SUPPORT
 	def_bool y
 
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 20e203a..71dd50b 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -55,9 +55,6 @@ config GENERIC_BUG
 config ZONE_DMA
 	def_bool y
 
-config GENERIC_GPIO
-	def_bool n
-
 config FORCE_MAX_ZONEORDER
 	int
 	default "14"
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index e4decc6..21d6ba9 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -170,9 +170,6 @@ source "mm/Kconfig"
 
 source "kernel/Kconfig.hz"
 
-config GENERIC_GPIO
-	def_bool n
-
 endmenu
 
 source "init/Kconfig"
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9a02f71..38ef339 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -101,9 +101,6 @@ config GENERIC_CALIBRATE_DELAY
 config HAVE_SETUP_PER_CPU_AREA
 	def_bool y
 
-config GENERIC_GPIO
-	bool
-
 config DMI
 	bool
 	default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6de8133..821170e 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -35,9 +35,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
 	bool
 
-config GENERIC_GPIO
-	bool
-
 config GENERIC_HWEIGHT
 	bool
 	default y
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index afc8973..0e97f5c5 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -54,9 +54,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
-config GENERIC_GPIO
-	def_bool n
-
 config NO_IOPORT
 	def_bool y
 
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 1323fa2..4fb682a 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -56,9 +56,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
-config GENERIC_GPIO
-	bool
-
 config GENERIC_CSUM
 	def_bool y
 
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ff0e563..5393981 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1004,9 +1004,6 @@ config GENERIC_ISA_DMA_SUPPORT_BROKEN
 config ISA_DMA_API
 	bool
 
-config GENERIC_GPIO
-	bool
-
 config HOLES_IN_ZONE
 	bool
 
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index e324402..6c404ee 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -44,9 +44,6 @@ config GENERIC_HWEIGHT
 config NO_IOPORT
 	def_bool y
 
-config GENERIC_GPIO
-	def_bool n
-
 config TRACE_IRQFLAGS_SUPPORT
         def_bool y
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ea5bb04..9c5bc68 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -82,11 +82,6 @@ config GENERIC_HWEIGHT
 	bool
 	default y
 
-config GENERIC_GPIO
-	bool
-	help
-	  Generic GPIO API support
-
 config PPC
 	bool
 	default y
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5e85963..f9391a6 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -92,9 +92,6 @@ config GENERIC_CSUM
 config GENERIC_HWEIGHT
 	def_bool y
 
-config GENERIC_GPIO
-	def_bool n
-
 config GENERIC_CALIBRATE_DELAY
 	bool
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3d361f2..90b3a0f 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -135,11 +135,6 @@ config GENERIC_ISA_DMA
 	bool
 	default y if SPARC32
 
-config GENERIC_GPIO
-	bool
-	help
-	  Generic GPIO API support
-
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
 	def_bool y if SPARC64
 
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 468cd70..41bcc00 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -23,9 +23,6 @@ config UNICORE32
 	  designs licensed by PKUnity Ltd.
 	  Please see web page at <http://www.pkunity.com/>.
 
-config GENERIC_GPIO
-	bool
-
 config GENERIC_CSUM
 	def_bool y
 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 70c0f3d..a6298c2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -172,9 +172,6 @@ config GENERIC_BUG_RELATIVE_POINTERS
 config GENERIC_HWEIGHT
 	def_bool y
 
-config GENERIC_GPIO
-	bool
-
 config ARCH_MAY_HAVE_PC_FDC
 	def_bool y
 	depends on ISA_DMA_API
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index b09de49..acdfc61 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -33,9 +33,6 @@ config RWSEM_XCHGADD_ALGORITHM
 config GENERIC_HWEIGHT
 	def_bool y
 
-config GENERIC_GPIO
-	bool
-
 config ARCH_HAS_ILOG2_U32
 	def_bool n
 
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 93aaadf..5d53aba 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -38,7 +38,6 @@ config GPIO_DEVRES
 menuconfig GPIOLIB
 	bool "GPIO Support"
 	depends on ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB
-	select GENERIC_GPIO
 	help
 	  This enables GPIO support through the generic GPIO library.
 	  You only need to enable this, if you also want to enable
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 36d7dee..4ad9c6b 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -255,7 +255,7 @@ static int __get_gpo_state_p3(struct lpc32xx_gpio_chip *group,
 }
 
 /*
- * GENERIC_GPIO primitives.
+ * GPIO primitives.
  */
 static int lpc32xx_gpio_dir_input_p012(struct gpio_chip *chip,
 	unsigned pin)
-- 
1.8.2

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 0/3] gpio: remove GENERIC_GPIO completely
  2013-03-29 13:11 [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alexandre Courbot
  2013-03-29 13:11 ` [PATCH 1/3] Convert selectors of GENERIC_GPIO to GPIOLIB Alexandre Courbot
  2013-03-29 13:11 ` [PATCH 2/3] Remove GENERIC_GPIO config option Alexandre Courbot
@ 2013-03-29 15:24 ` Alex Courbot
  2013-04-03 13:28 ` Linus Walleij
  2013-04-07  3:23 ` Chen Baozi
  4 siblings, 0 replies; 7+ messages in thread
From: Alex Courbot @ 2013-03-29 15:24 UTC (permalink / raw)
  To: linux-arm-kernel

On 03/29/2013 06:11 AM, Alexandre Courbot wrote:
> If I can get a few acks on these (or at least the first two ones) I'd like to
> include them into my next branch as soon as possible so points of breakage can
> be fixed. There are indeed a few new users of GENERIC_GPIO (CC Romain, I sent a
> warning but saw no action so far) in the next tree and compilation will break
> for them.

Alternatively, Grant may want to pull all the patches I did so far - 
they are in next for more than 10 days now and no complain has been 
raised. Also it's probably better to keep all GPIO-related changes into 
the same tree.

Alex.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 0/3] gpio: remove GENERIC_GPIO completely
  2013-03-29 13:11 [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alexandre Courbot
                   ` (2 preceding siblings ...)
  2013-03-29 15:24 ` [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alex Courbot
@ 2013-04-03 13:28 ` Linus Walleij
  2013-04-07  3:23 ` Chen Baozi
  4 siblings, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2013-04-03 13:28 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Mar 29, 2013 at 2:11 PM, Alexandre Courbot <gnurou@gmail.com> wrote:

> Since I have received no death threat from architecture maintainers I'd like to
> proceed with the remainder of this work so that it doesn't go half-baked into
> 3.10. These three patches finish the removal of the GENERIC_GPIO config option
> which has been made equivalent to GPIOLIB in the previous series. It does so by
> first changing all references to GENERIC_GPIO into GPIOLIB in driver code and
> configuration files, and then removing the unused option from the Kconfig files
> where it is declared.
>
> The last patch in the series confirms gpiolib in its new role as GPIO framework
> by renaming CONFIG_GPIOLIB into CONFIG_GPIO, following the model used by other
> frameworks. This name changing might rise concern but it seems more logical to
> me and the historical gpiolib name is still mentioned in the documentation to
> relieve the confusion.
>
> If I can get a few acks on these (or at least the first two ones) I'd like to
> include them into my next branch as soon as possible so points of breakage can
> be fixed. There are indeed a few new users of GENERIC_GPIO (CC Romain, I sent a
> warning but saw no action so far) in the next tree and compilation will break
> for them.
>
> Another issue, I could not update the Chinese documentation in a satisfying
> manner due to my absence of Chinese skills. Hope that will be forgiven.
>
> Alexandre Courbot (3):
>   Convert selectors of GENERIC_GPIO to GPIOLIB
>   Remove GENERIC_GPIO config option
>   Rename CONFIG_GPIOLIB to CONFIG_GPIO

The series:
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 0/3] gpio: remove GENERIC_GPIO completely
  2013-03-29 13:11 [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alexandre Courbot
                   ` (3 preceding siblings ...)
  2013-04-03 13:28 ` Linus Walleij
@ 2013-04-07  3:23 ` Chen Baozi
  2013-04-07 21:25   ` Alexandre Courbot
  4 siblings, 1 reply; 7+ messages in thread
From: Chen Baozi @ 2013-04-07  3:23 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Mar 29, 2013 at 06:11:15AM -0700, Alexandre Courbot wrote:
> Another issue, I could not update the Chinese documentation in a satisfying
> manner due to my absence of Chinese skills. Hope that will be forgiven.
> 
Hi Alexandre,

I have changed the Chinese documentation according to your update as
follows. Hopefully it would be helpful, :)

---
 Documentation/zh_CN/gpio.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/zh_CN/gpio.txt b/Documentation/zh_CN/gpio.txt
index 4fa7b4e..d5b8f01 100644
--- a/Documentation/zh_CN/gpio.txt
+++ b/Documentation/zh_CN/gpio.txt
@@ -84,10 +84,10 @@ GPIO ??
 ?????????????(??????????????????,???
 ????????? GPIO ????????????????????)
 
-????,?????????????????????????????
-??? Kconfig ???? GENERIC_GPIO??? (??? true)????
-?? <asm/gpio.h> ????????? GPIO ???????? Kconfig
-???????GENERIC_GPIO????????:
+????,????????????????????????????????
+??? Kconfig ??? ARCH_REQUIRE_GPIOLIB ?? ARCH_WANT_OPTIONAL_GPIOLIB
+????????? GPIO ???????? Kconfig
???????GENERIC_GPIO?
+???????:
 
        #include <linux/gpio.h>
  

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 0/3] gpio: remove GENERIC_GPIO completely
  2013-04-07  3:23 ` Chen Baozi
@ 2013-04-07 21:25   ` Alexandre Courbot
  0 siblings, 0 replies; 7+ messages in thread
From: Alexandre Courbot @ 2013-04-07 21:25 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Chen,

Cool, thanks! Can you send a formatted patch to include in the series,
or do you prefer me to squash it in the relevant patch and add your
signoff for this file?

Alex.

2013/4/6 Chen Baozi <baozich@gmail.com>:
> On Fri, Mar 29, 2013 at 06:11:15AM -0700, Alexandre Courbot wrote:
>> Another issue, I could not update the Chinese documentation in a satisfying
>> manner due to my absence of Chinese skills. Hope that will be forgiven.
>>
> Hi Alexandre,
>
> I have changed the Chinese documentation according to your update as
> follows. Hopefully it would be helpful, :)
>
> ---
>  Documentation/zh_CN/gpio.txt | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/zh_CN/gpio.txt b/Documentation/zh_CN/gpio.txt
> index 4fa7b4e..d5b8f01 100644
> --- a/Documentation/zh_CN/gpio.txt
> +++ b/Documentation/zh_CN/gpio.txt
> @@ -84,10 +84,10 @@ GPIO ??
>  ?????????????(??????????????????,???
>  ????????? GPIO ????????????????????)
>
> -????,?????????????????????????????
> -??? Kconfig ???? GENERIC_GPIO??? (??? true)????
> -?? <asm/gpio.h> ????????? GPIO ???????? Kconfig
> -???????GENERIC_GPIO????????:
> +????,????????????????????????????????
> +??? Kconfig ??? ARCH_REQUIRE_GPIOLIB ?? ARCH_WANT_OPTIONAL_GPIOLIB
> +????????? GPIO ???????? Kconfig
> ???????GENERIC_GPIO?
> +???????:
>
>         #include <linux/gpio.h>
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-04-07 21:25 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-29 13:11 [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alexandre Courbot
2013-03-29 13:11 ` [PATCH 1/3] Convert selectors of GENERIC_GPIO to GPIOLIB Alexandre Courbot
2013-03-29 13:11 ` [PATCH 2/3] Remove GENERIC_GPIO config option Alexandre Courbot
2013-03-29 15:24 ` [PATCH 0/3] gpio: remove GENERIC_GPIO completely Alex Courbot
2013-04-03 13:28 ` Linus Walleij
2013-04-07  3:23 ` Chen Baozi
2013-04-07 21:25   ` Alexandre Courbot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox