Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

Pull removal of GENERIC_GPIO from Grant Likely:
 "GENERIC_GPIO now synonymous with GPIOLIB.  There are no longer any
  valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it
  is possible to do so which has been causing confusion and breakage.
  This branch does the work to completely eliminate GENERIC_GPIO."

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
  gpio: update gpio Chinese documentation
  Remove GENERIC_GPIO config option
  Convert selectors of GENERIC_GPIO to GPIOLIB
  blackfin: force use of gpiolib
  m68k: coldfire: use gpiolib
  mips: pnx833x: remove requirement for GENERIC_GPIO
  openrisc: default GENERIC_GPIO to false
  avr32: default GENERIC_GPIO to false
  xtensa: remove explicit selection of GENERIC_GPIO
  sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
  powerpc: remove redundant GENERIC_GPIO selection
  unicore32: default GENERIC_GPIO to false
  unicore32: remove unneeded select GENERIC_GPIO
  arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB
  arm: remove redundant GENERIC_GPIO selection
  mips: alchemy: require gpiolib
  mips: txx9: change GENERIC_GPIO to GPIOLIB
  mips: loongson: use GPIO driver on CONFIG_GPIOLIB
  mips: remove redundant GENERIC_GPIO select

7 files changed, 1 insertions, 17 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index bbbe02197afb..c33e3ad2c8fd 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/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index bd40bbb15e14..6e287f1294fa 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -138,7 +138,6 @@ config PPC4xx_GPIO
         bool "PPC4xx GPIO support"
         depends on 40x
         select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_GPIO
         help
           Enable gpiolib support for ppc40x based boards
 
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 7be93367d92f..d6c7506ec7d9 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -248,7 +248,6 @@ config PPC4xx_GPIO
         bool "PPC4xx GPIO support"
         depends on 44x
         select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_GPIO
         help
           Enable gpiolib support for ppc440 based boards
 
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 8f02b05f4c96..efdd37c775ad 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -203,7 +203,6 @@ config GE_IMP3A
         select DEFAULT_UIMAGE
         select SWIOTLB
         select MMIO_NVRAM
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GE_FPGA
         help
@@ -328,7 +327,7 @@ config B4_QDS
         select PPC_E500MC
         select PHYS_64BIT
         select SWIOTLB
-        select GENERIC_GPIO
+        select GPIOLIB
         select ARCH_REQUIRE_GPIOLIB
         select HAS_RAPIDIO
         select PPC_EPAPR_HV_PIC
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 7a6279e38213..1afd1e4a2dd2 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -37,7 +37,6 @@ config GEF_PPC9A
         bool "GE PPC9A"
         select DEFAULT_UIMAGE
         select MMIO_NVRAM
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GE_FPGA
         help
@@ -47,7 +46,6 @@ config GEF_SBC310
         bool "GE SBC310"
         select DEFAULT_UIMAGE
         select MMIO_NVRAM
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GE_FPGA
         help
@@ -57,7 +55,6 @@ config GEF_SBC610
         bool "GE SBC610"
         select DEFAULT_UIMAGE
         select MMIO_NVRAM
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GE_FPGA
         select HAS_RAPIDIO
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 1fb0b3cddeb3..8dec3c0911ad 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -114,7 +114,6 @@ config 8xx_COPYBACK
 
 config 8xx_GPIO
         bool "GPIO API Support"
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Saying Y here will cause the ports on an MPC8xx processor to be used
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 34d224be93ba..a881232a3cce 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -302,7 +302,6 @@ config QUICC_ENGINE
 config QE_GPIO
         bool "QE GPIO support"
         depends on QUICC_ENGINE
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Say Y here if you're going to use hardware that connects to the
@@ -315,7 +314,6 @@ config CPM2
         select PPC_LIB_RHEAP
         select PPC_PCI_CHOICE
         select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_GPIO
         help
           The CPM2 (Communications Processor Module) is a coprocessor on
           embedded CPUs made by Freescale.  Selecting this option means that
@@ -353,7 +351,6 @@ config OF_RTC
 config SIMPLE_GPIO
         bool "Support for simple, memory-mapped GPIO controllers"
         depends on PPC
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Say Y here to support simple, memory-mapped GPIO controllers.
@@ -364,7 +361,6 @@ config SIMPLE_GPIO
 config MCU_MPC8349EMITX
         bool "MPC8349E-mITX MCU driver"
         depends on I2C=y && PPC_83xx
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Say Y here to enable soft power-off functionality on the Freescale