Skip to contentSkip to conversation

remove GENERIC_GPIO

PATCH In review Alexandre Courbot 5 participants 17 messages Apr 8, 2013 – Apr 16, 2013 1 message not in the archive

Subsystems (40)
lore
Share & tools
lore
#0 lore raw

v2 cover remove GENERIC_GPIO

From: Alexandre Courbot <[email protected]>

Second version, based on -next this time, of the GENERIC_GPIO removal patches. Considering there is only a short amount of time before 3.10 merge window opens, I hope this version will be considered for inclusion, otherwise we'd end up with an half-baked removal or I will have to rebase everything for 3.11. :(

Grant, if this is ok with you, how shall we have this integrated into your branch? Half of this has been tested in my -next branch, and the present patches make the next half, should I resend you the whole series based on -next and withdraw my branch? This is a fast moving target, so we should try and shoot that duck as soon as we can! :)

Changes from v1:
* Rebased on -next
* Added Chinese documentation update from Chen Baozi

Alexandre Courbot (3):
gpio: convert selectors of GENERIC_GPIO to GPIOLIB
gpio: remove GENERIC_GPIO config option
gpio: rename CONFIG_GPIOLIB to CONFIG_GPIO

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

 Documentation/gpio.txt                            | 51 ++++++++-----------
 Documentation/zh_CN/gpio.txt                      | 14 ++---
 arch/alpha/Kconfig                                |  5 +-
 arch/arm/Kconfig                                  | 62 +++++++++++------------
 arch/arm/configs/ape6evm_defconfig                |  2 +-
 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-bcm2835/Kconfig                     |  2 +-
 arch/arm/mach-highbank/Kconfig                    |  2 +-
 arch/arm/mach-imx/Kconfig                         |  2 +-
 arch/arm/mach-mxs/Kconfig                         |  2 +-
 arch/arm/mach-nomadik/Kconfig                     |  2 +-
 arch/arm/mach-omap2/Kconfig                       |  2 +-
 arch/arm/mach-picoxcell/Kconfig                   |  2 +-
 arch/arm/mach-prima2/Kconfig                      |  2 +-
 arch/arm/mach-s3c24xx/Kconfig                     |  2 +-
 arch/arm/mach-shmobile/Kconfig                    | 37 +++++++-------
 arch/arm/mach-socfpga/Kconfig                     |  4 +-
 arch/arm/mach-spear/Kconfig                       |  2 +-
 arch/arm/mach-tegra/Kconfig                       |  2 +-
 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   |  4 +-
 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               | 16 +++---
 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                  |  3 +-
 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/iio/magnetometer/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                              |  8 +--
 drivers/leds/leds-tca6507.c                       |  8 +--
 drivers/leds/trigger/Kconfig                      |  2 +-
 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/core.c                            |  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/reset/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/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/phy/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 +-
 178 files changed, 393 insertions(+), 462 deletions(-)
Signature · 1 line
1.8.2
#1 lore raw

PATCH v2 1/4 gpio: convert selectors of GENERIC_GPIO to GPIOLIB

From: Alexandre Courbot <[email protected]>

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.

---
 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/reset/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/phy/Kconfig              |  2 +-
 drivers/video/Kconfig                |  2 +-
 drivers/video/backlight/Kconfig      |  4 ++--
 drivers/w1/masters/Kconfig           |  2 +-
 include/linux/gpio.h                 |  6 +++---
 26 files changed, 53 insertions(+), 53 deletions(-)
arch/unicore32/Kconfig +1 -1
index 63521dc..468cd70 100644
@@ -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
drivers/extcon/Kconfig +1 -1
index 5168a13..3297301 100644
@@ -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.
drivers/i2c/busses/Kconfig +2 -2
index adfee98..631736e 100644
@@ -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
drivers/i2c/muxes/Kconfig +1 -1
index 0be5b83..40062ed 100644
@@ -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
drivers/input/keyboard/Kconfig +3 -3
index 6a195d5..62a2c0e 100644
@@ -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.
drivers/input/misc/Kconfig +4 -4
index af80928..bb698e1 100644
@@ -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
drivers/input/mouse/Kconfig +1 -1
index 802bd6a..effa9c5 100644
@@ -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
drivers/leds/Kconfig +3 -3
index d44806d..ef99229 100644
@@ -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
@@ -362,7 +362,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
@@ -431,7 +431,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.
drivers/mtd/maps/Kconfig +1 -1
index bed9634..bed9d58 100644
@@ -351,7 +351,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
drivers/mtd/nand/Kconfig +1 -1
index 1cca712..a60f6c1 100644
@@ -75,7 +75,7 @@ config MTD_NAND_DENALI_SCRATCH_REG_ADDR
 
 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.
 
drivers/net/phy/Kconfig +1 -1
index 4503452..1e11f2b 100644
@@ -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.
 
drivers/pinctrl/sh-pfc/Kconfig +13 -13
index 0e1f99c..f8a2ae4 100644
@@ -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
@@ -40,19 +40,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
@@ -68,55 +68,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
drivers/regulator/Kconfig +1 -1
index a5d97ea..8bb2644 100644
@@ -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.
drivers/reset/Kconfig +1 -1
index e728d36..c7dcf44 100644
@@ -16,7 +16,7 @@ if RESET_CONTROLLER
 
 config RESET_GPIO
 	tristate "GPIO reset controller support"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  This driver provides support for reset lines that are controlled
 	  directly by GPIOs.
drivers/spi/Kconfig +4 -4
index 141d8c1..92a9345 100644
@@ -62,7 +62,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
@@ -175,7 +175,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
@@ -259,7 +259,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.
@@ -457,7 +457,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
 
drivers/staging/android/Kconfig +1 -1
index 9f61d46..c0c95be 100644
@@ -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
drivers/staging/iio/accel/Kconfig +1 -1
index e2e786d..ad45dfb 100644
@@ -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
drivers/staging/iio/adc/Kconfig +1 -1
index d990829..cabc7a3 100644
@@ -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.
drivers/staging/iio/addac/Kconfig +1 -1
index 698a897..e6795e0 100644
@@ -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.
drivers/staging/iio/resolver/Kconfig +2 -2
index 49f69ef..ce360f1 100644
@@ -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.
drivers/staging/iio/trigger/Kconfig +1 -1
index d44d3ad..1a051da 100644
@@ -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.
 
drivers/usb/phy/Kconfig +1 -1
index 3a7fec9..21153d1 100644
@@ -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
drivers/video/Kconfig +1 -1
index d90e3f5..6170a87 100644
@@ -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
drivers/video/backlight/Kconfig +2 -2
index 2e166c3..d5ab658 100644
@@ -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.
drivers/w1/masters/Kconfig +1 -1
index e8ca63a..2bd1257 100644
@@ -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.
include/linux/gpio.h +3 -3
index f6c7ae3..552e3f4 100644
@@ -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;
 
Signature · 1 line
1.8.2
Acked-by on v2 1/4
#2 lore raw

Re: [PATCH v2 1/4] gpio: convert selectors of GENERIC_GPIO to GPIOLIB

Quoted 7 lines · Alexandre Courbot

From: Alexandre Courbot <[email protected]>

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.

Quoted 592 lines
---
 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/reset/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/phy/Kconfig              |  2 +-
 drivers/video/Kconfig                |  2 +-
 drivers/video/backlight/Kconfig      |  4 ++--
 drivers/w1/masters/Kconfig           |  2 +-
 include/linux/gpio.h                 |  6 +++---
 26 files changed, 53 insertions(+), 53 deletions(-)
arch/unicore32/Kconfig +1 -1
index 63521dc..468cd70 100644
@@ -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
drivers/extcon/Kconfig +1 -1
index 5168a13..3297301 100644
@@ -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.
drivers/i2c/busses/Kconfig +2 -2
index adfee98..631736e 100644
@@ -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
drivers/i2c/muxes/Kconfig +1 -1
index 0be5b83..40062ed 100644
@@ -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
drivers/input/keyboard/Kconfig +3 -3
index 6a195d5..62a2c0e 100644
@@ -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.
drivers/input/misc/Kconfig +4 -4
index af80928..bb698e1 100644
@@ -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
drivers/input/mouse/Kconfig +1 -1
index 802bd6a..effa9c5 100644
@@ -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
drivers/leds/Kconfig +3 -3
index d44806d..ef99229 100644
@@ -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
@@ -362,7 +362,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
@@ -431,7 +431,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.
drivers/mtd/maps/Kconfig +1 -1
index bed9634..bed9d58 100644
@@ -351,7 +351,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
drivers/mtd/nand/Kconfig +1 -1
index 1cca712..a60f6c1 100644
@@ -75,7 +75,7 @@ config MTD_NAND_DENALI_SCRATCH_REG_ADDR
 
 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.
 
drivers/net/phy/Kconfig +1 -1
index 4503452..1e11f2b 100644
@@ -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.
 
drivers/pinctrl/sh-pfc/Kconfig +13 -13
index 0e1f99c..f8a2ae4 100644
@@ -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
@@ -40,19 +40,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
@@ -68,55 +68,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
drivers/regulator/Kconfig +1 -1
index a5d97ea..8bb2644 100644
@@ -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.
drivers/reset/Kconfig +1 -1
index e728d36..c7dcf44 100644
@@ -16,7 +16,7 @@ if RESET_CONTROLLER
 
 config RESET_GPIO
 	tristate "GPIO reset controller support"
-	depends on GENERIC_GPIO
+	depends on GPIOLIB
 	help
 	  This driver provides support for reset lines that are controlled
 	  directly by GPIOs.
drivers/spi/Kconfig +4 -4
index 141d8c1..92a9345 100644
@@ -62,7 +62,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
@@ -175,7 +175,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
@@ -259,7 +259,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.
@@ -457,7 +457,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
 
drivers/staging/android/Kconfig +1 -1
index 9f61d46..c0c95be 100644
@@ -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
drivers/staging/iio/accel/Kconfig +1 -1
index e2e786d..ad45dfb 100644
@@ -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
drivers/staging/iio/adc/Kconfig +1 -1
index d990829..cabc7a3 100644
@@ -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.
drivers/staging/iio/addac/Kconfig +1 -1
index 698a897..e6795e0 100644
@@ -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.
drivers/staging/iio/resolver/Kconfig +2 -2
index 49f69ef..ce360f1 100644
@@ -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.
drivers/staging/iio/trigger/Kconfig +1 -1
index d44d3ad..1a051da 100644
@@ -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.
 
drivers/usb/phy/Kconfig +1 -1
index 3a7fec9..21153d1 100644
@@ -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
drivers/video/Kconfig +1 -1
index d90e3f5..6170a87 100644
@@ -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
drivers/video/backlight/Kconfig +2 -2
index 2e166c3..d5ab658 100644
@@ -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.
drivers/w1/masters/Kconfig +1 -1
index e8ca63a..2bd1257 100644
@@ -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.
include/linux/gpio.h +3 -3
index f6c7ae3..552e3f4 100644
@@ -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;
 
Signature · 1 line
1.8.2
Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
#3 lore raw

PATCH v2 2/4 gpio: remove GENERIC_GPIO config option

In reply to Alexandre Courbot

From: Alexandre Courbot <[email protected]>

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.

---
 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(-)
Documentation/gpio.txt +5 -5
index 77a1d11..6f83fa9 100644
@@ -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>
 
arch/alpha/Kconfig +0 -3
index 8629127..837a1f2 100644
@@ -55,9 +55,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config GENERIC_GPIO
-	bool
-
 config ZONE_DMA
 	bool
 	default y
arch/arm/Kconfig +0 -3
index 946b518..d5098f3 100644
@@ -109,9 +109,6 @@ config MIGHT_HAVE_PCI
 config SYS_SUPPORTS_APM_EMULATION
 	bool
 
-config GENERIC_GPIO
-	bool
-
 config HAVE_TCM
 	bool
 	select GENERIC_ALLOCATOR
arch/arm/plat-orion/gpio.c +1 -1
index c29ee7e..59ddf4d 100644
@@ -150,7 +150,7 @@ err_out:
 }
 
 /*
- * GENERIC_GPIO primitives.
+ * GPIO primitives.
  */
 static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
 {
arch/arm64/Kconfig +0 -3
index 9b6d19f..e6e7007 100644
@@ -92,9 +92,6 @@ config SWIOTLB
 config IOMMU_HELPER
 	def_bool SWIOTLB
 
-config GENERIC_GPIO
-	bool
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
arch/avr32/Kconfig +0 -3
index d22c6b4..ff775b8 100644
@@ -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
 
arch/blackfin/Kconfig +0 -3
index ed62933..a117652 100644
@@ -52,9 +52,6 @@ config GENERIC_BUG
 config ZONE_DMA
 	def_bool y
 
-config GENERIC_GPIO
-	def_bool n
-
 config FORCE_MAX_ZONEORDER
 	int
 	default "14"
arch/hexagon/Kconfig +0 -3
index 04dff5b..b418471 100644
@@ -157,9 +157,6 @@ source "mm/Kconfig"
 
 source "kernel/Kconfig.hz"
 
-config GENERIC_GPIO
-	def_bool n
-
 endmenu
 
 source "init/Kconfig"
arch/ia64/Kconfig +0 -3
index e7e55a0..15aae79 100644
@@ -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
arch/m68k/Kconfig +0 -3
index 6de8133..821170e 100644
@@ -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
arch/metag/Kconfig +0 -3
index 6f16c14..dcd9440 100644
@@ -52,9 +52,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
-config GENERIC_GPIO
-	def_bool n
-
 config NO_IOPORT
 	def_bool y
 
arch/microblaze/Kconfig +0 -3
index 173ab2c..ffe9372 100644
@@ -53,9 +53,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
-config GENERIC_GPIO
-	bool
-
 config GENERIC_CSUM
 	def_bool y
 
arch/mips/Kconfig +0 -3
index bd50459..4d4cdce 100644
@@ -1005,9 +1005,6 @@ config GENERIC_ISA_DMA_SUPPORT_BROKEN
 config ISA_DMA_API
 	bool
 
-config GENERIC_GPIO
-	bool
-
 config HOLES_IN_ZONE
 	bool
 
arch/openrisc/Kconfig +0 -3
index df469d7..1072bfd 100644
@@ -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
 
arch/powerpc/Kconfig +0 -5
index 0ac9f61..ec1f292 100644
@@ -82,11 +82,6 @@ config GENERIC_HWEIGHT
 	bool
 	default y
 
-config GENERIC_GPIO
-	bool
-	help
-	  Generic GPIO API support
-
 config PPC
 	bool
 	default y
arch/sh/Kconfig +0 -3
index 5e85963..f9391a6 100644
@@ -92,9 +92,6 @@ config GENERIC_CSUM
 config GENERIC_HWEIGHT
 	def_bool y
 
-config GENERIC_GPIO
-	def_bool n
-
 config GENERIC_CALIBRATE_DELAY
 	bool
 
arch/sparc/Kconfig +0 -5
index 91cf75d..255be2d 100644
@@ -137,11 +137,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
 
arch/unicore32/Kconfig +0 -3
index 468cd70..41bcc00 100644
@@ -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
 
arch/x86/Kconfig +0 -3
index 75267ec..0619778 100644
@@ -174,9 +174,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
arch/xtensa/Kconfig +0 -3
index a9bdb1c..2348ec0 100644
@@ -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
 
drivers/gpio/Kconfig +0 -1
index afbe0d1..8351661 100644
@@ -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
drivers/gpio/gpio-lpc32xx.c +1 -1
index 36d7dee..4ad9c6b 100644
@@ -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)
Signature · 1 line
1.8.2
Acked-by on v2 2/4
#4 lore raw

Re: [PATCH v2 2/4] gpio: remove GENERIC_GPIO config option

Quoted 8 lines · Alexandre Courbot

From: Alexandre Courbot <[email protected]>

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.

#5 lore raw

PATCH v2 4/4 gpio: update gpio Chinese documentation

In reply to Alexandre Courbot

From: Chen Baozi <[email protected]>

Since the GENERIC_GPIO has been removed and the documentation of it has been modified, this patch updates the corresponding documentation of gpio in Chinese.

---
 Documentation/zh_CN/gpio.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/zh_CN/gpio.txt +4 -4
index 99dbb69..8c8c712 100644
@@ -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>
 
Signature · 1 line
1.8.2
Acked-by on v2 4/4
#6 lore raw

Re: [PATCH v2 4/4] gpio: update gpio Chinese documentation

Quoted 8 lines · Alexandre Courbot

From: Chen Baozi <[email protected]>

Since the GENERIC_GPIO has been removed and the documentation of it has been modified, this patch updates the corresponding documentation of gpio in Chinese.

Quoted 26 lines
---
 Documentation/zh_CN/gpio.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/zh_CN/gpio.txt +4 -4
index 99dbb69..8c8c712 100644
@@ -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>
 
Signature · 1 line
1.8.2
Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
#7 lore raw
In reply to Alexandre Courbot

Hi Alexandre,

Quoted 13 lines · Alexandre Courbot

From: Alexandre Courbot <[email protected]>

Second version, based on -next this time, of the GENERIC_GPIO removal patches. Considering there is only a short amount of time before 3.10 merge window opens, I hope this version will be considered for inclusion, otherwise we'd end up with an half-baked removal or I will have to rebase everything for 3.11. :(

Grant, if this is ok with you, how shall we have this integrated into your branch? Half of this has been tested in my -next branch, and the present patches make the next half, should I resend you the whole series based on -next and withdraw my branch? This is a fast moving target, so we should try and shoot that duck as soon as we can! :)

Quoted 9 lines

Changes from v1:
* Rebased on -next
* Added Chinese documentation update from Chen Baozi

Alexandre Courbot (3):
gpio: convert selectors of GENERIC_GPIO to GPIOLIB
gpio: remove GENERIC_GPIO config option
gpio: rename CONFIG_GPIOLIB to CONFIG_GPIO

I'm the maintainer for arch/arc.

For 3.10, we are going to have a sub-platform included which enables GPIO. However given that your patch is still not in a maintainer tree I'm going to apply the platform patch with GENERIC_GPIO and it would show up in -next as well. But don't be alarmed - to align with your work, Christian or you can then possibly apply a patch to make arch/arc/* confirm to your work - preferably via your tree/patchseries - OK ?

Thx,
-Vineet

#8 lore raw

Hi Vineet,

Quoted 8 lines · Vineet Gupta

I'm the maintainer for arch/arc.

For 3.10, we are going to have a sub-platform included which enables GPIO. However given that your patch is still not in a maintainer tree I'm going to apply the platform patch with GENERIC_GPIO and it would show up in -next as well. But don't be alarmed - to align with your work, Christian or you can then possibly apply a patch to make arch/arc/* confirm to your work - preferably via your tree/patchseries - OK ?

I guess that would work, but since I assume your platforms' GPIO implementation use gpiolib anyway wouldn't it be simpler and more logical to directly require it?

If you have reasons for not doing so I'm ok with doing the switch later too, anyway that's what I had to do for all the other archs.

Alex.

#9 lore raw

Hello Alexandre,

Quoted 13 lines · Alexandre Courbot

Hi Vineet,

Quoted 8 lines · Vineet Gupta

I'm the maintainer for arch/arc.

For 3.10, we are going to have a sub-platform included which enables GPIO. However given that your patch is still not in a maintainer tree I'm going to apply the platform patch with GENERIC_GPIO and it would show up in -next as well. But don't be alarmed - to align with your work, Christian or you can then possibly apply a patch to make arch/arc/* confirm to your work - preferably via your tree/patchseries - OK ?

Quoted 6 lines

I guess that would work, but since I assume your platforms' GPIO implementation use gpiolib anyway wouldn't it be simpler and more logical to directly require it?

If you have reasons for not doing so I'm ok with doing the switch later too, anyway that's what I had to do for all the other archs.

The GPIO driver patch was proposed on lkml a few days ago and although I am not aware of any "GENERIC" methods it uses it does not compile without GENERIC_GPIO being defined (errors in of_gpio.h etc). You can review the patch at https://lkml.org/lkml/2013/4/10/385.

We'd be happy to accept any guidance on how to remove GENERIC_GPIO. Also, I'm not sure the custom interface to the pin controller is a great solution and suggestions are welcome. The goal is to remove redundancy between the drivers in the definition of pin groups.

Regards,
Christian

Signature · 4 lines
  Christian Ruppert              ,          <[email protected]>
                                /|
  Tel: +41/(0)22 816 19-42     //|                 3, Chemin du Pré-Fleuri
                             _// | bilis Systems   CH-1228 Plan-les-Ouates
#10 lore raw
Quoted 28 lines · Christian Ruppert

Hello Alexandre,

Quoted 13 lines · Alexandre Courbot

Hi Vineet,

Quoted 8 lines · Vineet Gupta

I'm the maintainer for arch/arc.

For 3.10, we are going to have a sub-platform included which enables GPIO. However given that your patch is still not in a maintainer tree I'm going to apply the platform patch with GENERIC_GPIO and it would show up in -next as well. But don't be alarmed - to align with your work, Christian or you can then possibly apply a patch to make arch/arc/* confirm to your work - preferably via your tree/patchseries - OK ?

Quoted 6 lines

I guess that would work, but since I assume your platforms' GPIO implementation use gpiolib anyway wouldn't it be simpler and more logical to directly require it?

If you have reasons for not doing so I'm ok with doing the switch later too, anyway that's what I had to do for all the other archs.

The GPIO driver patch was proposed on lkml a few days ago and although I am not aware of any "GENERIC" methods it uses it does not compile without GENERIC_GPIO being defined (errors in of_gpio.h etc). You can review the patch at https://lkml.org/lkml/2013/4/10/385.

Quoted 4 lines

We'd be happy to accept any guidance on how to remove GENERIC_GPIO. Also, I'm not sure the custom interface to the pin controller is a great solution and suggestions are welcome. The goal is to remove redundancy between the drivers in the definition of pin groups.

Hi Christian,

Thanks for the link to the patch. This is rather puzzling - in drivers/gpio/Kconfig your GPIO_TB10X config option seems to be under the "if GPIOLIB" condition which is what I expect, since your driver uses gpiolib. If you go to the GPIOLIB config option, you notice that is explicitly selects GENERIC_GPIO as a result of being enabled. Therefore CONFIG_GENERIC_GPIO should always be defined whenever your driver is compiled and it should not be needed to select it elsewhere. Do we agree on that?

I'd really like to go to the bottom of this since I saw several similar issues already, but I don't understand how this can happen at all. Having the .config of both the working (with GENERIC_GPIO selected) and non-working (only GPIOLIB selected) cases would probably be helpful, could you send them to me?

Thanks,
Alex.

#11 lore raw
Quoted 45 lines · Alex Courbot
Quoted 28 lines · Christian Ruppert

Hello Alexandre,

Quoted 13 lines · Alexandre Courbot

Hi Vineet,

Quoted 8 lines · Vineet Gupta

I'm the maintainer for arch/arc.

For 3.10, we are going to have a sub-platform included which enables GPIO. However given that your patch is still not in a maintainer tree I'm going to apply the platform patch with GENERIC_GPIO and it would show up in -next as well. But don't be alarmed - to align with your work, Christian or you can then possibly apply a patch to make arch/arc/* confirm to your work - preferably via your tree/patchseries - OK ?

Quoted 6 lines

I guess that would work, but since I assume your platforms' GPIO implementation use gpiolib anyway wouldn't it be simpler and more logical to directly require it?

If you have reasons for not doing so I'm ok with doing the switch later too, anyway that's what I had to do for all the other archs.

The GPIO driver patch was proposed on lkml a few days ago and although I am not aware of any "GENERIC" methods it uses it does not compile without GENERIC_GPIO being defined (errors in of_gpio.h etc). You can review the patch at https://lkml.org/lkml/2013/4/10/385.

Quoted 4 lines

We'd be happy to accept any guidance on how to remove GENERIC_GPIO. Also, I'm not sure the custom interface to the pin controller is a great solution and suggestions are welcome. The goal is to remove redundancy between the drivers in the definition of pin groups.

Hi Christian,

Thanks for the link to the patch. This is rather puzzling - in drivers/gpio/Kconfig your GPIO_TB10X config option seems to be under the "if GPIOLIB" condition which is what I expect, since your driver uses gpiolib. If you go to the GPIOLIB config option, you notice that is explicitly selects GENERIC_GPIO as a result of being enabled. Therefore CONFIG_GENERIC_GPIO should always be defined whenever your driver is compiled and it should not be needed to select it elsewhere. Do we agree on that?

Quoted 8 lines

I'd really like to go to the bottom of this since I saw several similar issues already, but I don't understand how this can happen at all. Having the .config of both the working (with GENERIC_GPIO selected) and non-working (only GPIOLIB selected) cases would probably be helpful, could you send them to me?

Thanks,
Alex.

Hello Alexandre,

Thanks for taking a look at the driver. I think the issue we see is due to the fact that "Platforms must declare GENERIC_GPIO support in their Kconfig (boolean true)" (from Documentation/gpio.txt). This seems to be still the case at the moment and I haven't found a way around it. Removing the config GENERIC_GPIO section from our platform's Kconfig (see arch/arc/plat-tb10x/Kconfig in linux-next) results in compilation errors. This seems logical since "config GPIOLIB" only selects GENERIC_GPIO but assumes it is defined elsewhere.

We were wondering if we could get rid of the "config GENERIC_GPIO" section in the new platform's Kconfig in order to avoid adding things you are going to remove again soon and in order to check if there aren't any hidden dependencies on GENERIC_GPIO in the driver. Do I understand your mail correctly that this is not yet possible?

Greetings,
Christian

Signature · 4 lines
  Christian Ruppert              ,          <[email protected]>
                                /|
  Tel: +41/(0)22 816 19-42     //|                 3, Chemin du Pré-Fleuri
                             _// | bilis Systems   CH-1228 Plan-les-Ouates
#12 lore raw

Hi Christian,

Quoted 9 lines · Christian Ruppert

Thanks for taking a look at the driver. I think the issue we see is due to the fact that "Platforms must declare GENERIC_GPIO support in their Kconfig (boolean true)" (from Documentation/gpio.txt). This seems to be still the case at the moment and I haven't found a way around it. Removing the config GENERIC_GPIO section from our platform's Kconfig (see arch/arc/plat-tb10x/Kconfig in linux-next) results in compilation errors. This seems logical since "config GPIOLIB" only selects GENERIC_GPIO but assumes it is defined elsewhere.

Quoted 5 lines

We were wondering if we could get rid of the "config GENERIC_GPIO" section in the new platform's Kconfig in order to avoid adding things you are going to remove again soon and in order to check if there aren't any hidden dependencies on GENERIC_GPIO in the driver. Do I understand your mail correctly that this is not yet possible?

Oh, then it looks like *I* did not understand your mail correctly. It is absolutely necessary indeed that your architecture declares a GENERIC_GPIO config option. What I was trying to prevent you from doing was to put new "select GENERIC_GPIO" or "depends on GENERIC_GPIO" in your Kconfig files.

If the only reference to GENERIC_GPIO in your architecture or drivers is the declaration of this config option, then it is perfectly fine - I will take care of removing it when the time is right.

So I guess you guys are just fine - sorry about the misunderstanding!

Thanks,
Alex.

#13 lore raw
In reply to Alexandre Courbot
Quoted 7 lines · Alexandre Courbot

From: Alexandre Courbot <[email protected]>

Second version, based on -next this time, of the GENERIC_GPIO removal patches. Considering there is only a short amount of time before 3.10 merge window opens, I hope this version will be considered for inclusion, otherwise we'd end up with an half-baked removal or I will have to rebase everything for 3.11. :(

Quoted 5 lines

Grant, if this is ok with you, how shall we have this integrated into your branch? Half of this has been tested in my -next branch, and the present patches make the next half, should I resend you the whole series based on -next and withdraw my branch? This is a fast moving target, so we should try and shoot that duck as soon as we can! :)

Most of your patches are already in linux-next in a separate branch, so the first thing to do is get these remaining patches into that same branch. As we discussed on IRC, you need to move yor current "remove_generic_gpio" branch into your for_next branch so that it is picked up by Stephen. There isn't any functional change there, but it means that your series will be based on a defined point of Linus' tree (v3.9-rc6) instead of an arbitrary commit point between -rc3 and -rc4.

As for these four new patches, I'll reply to each of them with an ack/nak. For the ones I ack, add them to your for_next branch right away so they get into linux-next. You'll also want to send an email to Stephen with the fixups that you already know about so that he can deal with the breakage in linux-next caused by the remove GENERIC_GPIO commit.

g.

Quoted 196 lines

Changes from v1:
* Rebased on -next
* Added Chinese documentation update from Chen Baozi

Alexandre Courbot (3):
gpio: convert selectors of GENERIC_GPIO to GPIOLIB
gpio: remove GENERIC_GPIO config option
gpio: rename CONFIG_GPIOLIB to CONFIG_GPIO

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

 Documentation/gpio.txt                            | 51 ++++++++-----------
 Documentation/zh_CN/gpio.txt                      | 14 ++---
 arch/alpha/Kconfig                                |  5 +-
 arch/arm/Kconfig                                  | 62 +++++++++++------------
 arch/arm/configs/ape6evm_defconfig                |  2 +-
 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-bcm2835/Kconfig                     |  2 +-
 arch/arm/mach-highbank/Kconfig                    |  2 +-
 arch/arm/mach-imx/Kconfig                         |  2 +-
 arch/arm/mach-mxs/Kconfig                         |  2 +-
 arch/arm/mach-nomadik/Kconfig                     |  2 +-
 arch/arm/mach-omap2/Kconfig                       |  2 +-
 arch/arm/mach-picoxcell/Kconfig                   |  2 +-
 arch/arm/mach-prima2/Kconfig                      |  2 +-
 arch/arm/mach-s3c24xx/Kconfig                     |  2 +-
 arch/arm/mach-shmobile/Kconfig                    | 37 +++++++-------
 arch/arm/mach-socfpga/Kconfig                     |  4 +-
 arch/arm/mach-spear/Kconfig                       |  2 +-
 arch/arm/mach-tegra/Kconfig                       |  2 +-
 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   |  4 +-
 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               | 16 +++---
 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                  |  3 +-
 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/iio/magnetometer/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                              |  8 +--
 drivers/leds/leds-tca6507.c                       |  8 +--
 drivers/leds/trigger/Kconfig                      |  2 +-
 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/core.c                            |  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/reset/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/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/phy/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 +-
 178 files changed, 393 insertions(+), 462 deletions(-)
Signature · 1 line
1.8.2
Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
#14 lore raw
Quoted 14 lines · Grant Likely
Quoted 7 lines · Alexandre Courbot

From: Alexandre Courbot <[email protected]>

Second version, based on -next this time, of the GENERIC_GPIO removal patches. Considering there is only a short amount of time before 3.10 merge window opens, I hope this version will be considered for inclusion, otherwise we'd end up with an half-baked removal or I will have to rebase everything for 3.11. :(

Quoted 5 lines

Grant, if this is ok with you, how shall we have this integrated into your branch? Half of this has been tested in my -next branch, and the present patches make the next half, should I resend you the whole series based on -next and withdraw my branch? This is a fast moving target, so we should try and shoot that duck as soon as we can! :)

Quoted 7 lines

Most of your patches are already in linux-next in a separate branch, so the first thing to do is get these remaining patches into that same branch. As we discussed on IRC, you need to move yor current "remove_generic_gpio" branch into your for_next branch so that it is picked up by Stephen. There isn't any functional change there, but it means that your series will be based on a defined point of Linus' tree (v3.9-rc6) instead of an arbitrary commit point between -rc3 and -rc4.

On second thought, no don't do this. Just leave it as is. It is more important to retain the test coverage you've already had in linux-next on these commits. Just apply the patches I've acked onto your existing for_next branch.

g.

#15 lore raw

Hi Grant, Stephen,

Quoted 14 lines · Grant Likely
Quoted 6 lines
Quoted 5 lines

Grant, if this is ok with you, how shall we have this integrated into your branch? Half of this has been tested in my -next branch, and the present patches make the next half, should I resend you the whole series based on -next and withdraw my branch? This is a fast moving target, so we should try and shoot that duck as soon as we can! :)

Quoted 7 lines

Most of your patches are already in linux-next in a separate branch, so the first thing to do is get these remaining patches into that same branch. As we discussed on IRC, you need to move yor current "remove_generic_gpio" branch into your for_next branch so that it is picked up by Stephen. There isn't any functional change there, but it means that your series will be based on a defined point of Linus' tree (v3.9-rc6) instead of an arbitrary commit point between -rc3 and -rc4.

Quoted 4 lines

On second thought, no don't do this. Just leave it as is. It is more important to retain the test coverage you've already had in linux-next on these commits. Just apply the patches I've acked onto your existing for_next branch.

Ok, so I have added the 3 acked patches to the top of my for_next branch and they will be pulled by Stephen for the next -next iteration. I have also tried to merge the branch by myself into today's next, and have been relieved to see that conflicts were actually minimal (thanks to not including the GPIOLIB -> GPIO renaming patch - definitely a good idea). Here is some information about how the branch should look after merging:

"git grep CONFIG_GENERIC_GPIO" should return 0 hits whereas "git grep '\bGENERIC_GPIO\b'" should return only one hit, in Documentation/zh_CN/gpio.txt (Chen, I'm not sure if you intended to leave this one in your documentation update patch?). Remaining selectors or dependencies on GENERIC_GPIO should be turned into GPIOLIB. Also the arc/ architecture defines GENERIC_GPIO once more, this definition can be deleted.

There were only 3 or 4 conflicts to address on today's -next, and then the kernel compiles just fine on the architectures I tried.

Thanks!
Alex.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#17 lore raw

Re: [PATCH v2 3/4] gpio: rename CONFIG_GPIOLIB to CONFIG_GPIO

Quoted 6 lines · Alexandre Courbot

From: Alexandre Courbot <[email protected]>

The removal of CONFIG_GENERIC_GPIO turned gpiolib into the only way to implement the generic GPIO API, effectively making it the "GPIO framework".

Quoted 6 lines

This patch tries to reflect this reality by changing occurences of GPIOLIB into the simpler GPIO in various places (notable configuration options) and updating the documentation.

This just ends up being painful and extra churn. I don't think it is worth it to change the config symbol name.

g.