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

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/plat-orion/Makefile
index 2eca54b65906e1ffbf69ffd9a27b74d71b7415d6,bbc0d6b6aac4323ad91b0a508530c5f6e66e8c80..9433605cd290b38aabba4e6d0f94de822d84e743
--- 1/arch/arm/plat-orion/Makefile
--- 2/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@@ -3,6 -3,8 +3,6 @@@
  #
  ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
  
- orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o
 -obj-y                             += addr-map.o
 -
+ orion-gpio-$(CONFIG_GPIOLIB)      += gpio.o
  obj-$(CONFIG_PLAT_ORION_LEGACY)   += irq.o pcie.o time.o common.o mpp.o
  obj-$(CONFIG_PLAT_ORION_LEGACY)   += $(orion-gpio-y)

diff --cc arch/arm/plat-orion/gpio.c
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/avr32/Kconfig
Simple merge

diff --cc arch/blackfin/Kconfig
index 453ebe46b065d01d0afa272528220f9e73aede52,71dd50b7c13a47a42dcea1c9561be6bbea3787fb..a117652b5feaac84e4bb880bb8b1b4772c8b6f5a
--- 1/arch/blackfin/Kconfig
--- 2/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@@ -27,9 -31,8 +27,9 @@@ config BLACKFI
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select ARCH_HAVE_CUSTOM_GPIO_H
-       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARCH_REQUIRE_GPIOLIB
        select HAVE_UID16
 +      select HAVE_UNDERSCORE_SYMBOL_PREFIX
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_GENERIC_HARDIRQS

diff --cc arch/hexagon/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/metag/Kconfig
Simple merge

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/openrisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/44x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/Kconfig
index 8f02b05f4c96f8f8ef868819bb6e82e203ab063a,78549b6ebf30ca3414db02c30c4668cb9338b37a..efdd37c775ad40dd489f90c02a37c37d78ed3c5f
--- 1/arch/powerpc/platforms/85xx/Kconfig
--- 2/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@@ -305,40 -304,6 +304,40 @@@ config PPC_QEMU_E50
          unset based on the emulated CPU (or actual host CPU in the case
          of KVM).
  
-       select GENERIC_GPIO
 +if PPC64
 +
 +config T4240_QDS
 +      bool "Freescale T4240 QDS"
 +      select DEFAULT_UIMAGE
 +      select E500
 +      select PPC_E500MC
 +      select PHYS_64BIT
 +      select SWIOTLB
 +      select ARCH_REQUIRE_GPIOLIB
 +      select GPIO_MPC8XXX
 +      select HAS_RAPIDIO
 +      select PPC_EPAPR_HV_PIC
 +      help
 +        This option enables support for the T4240 QDS board
 +
 +config B4_QDS
 +      bool "Freescale B4 QDS"
 +      select DEFAULT_UIMAGE
 +      select E500
 +      select PPC_E500MC
 +      select PHYS_64BIT
 +      select SWIOTLB
++      select GPIOLIB
 +      select ARCH_REQUIRE_GPIOLIB
 +      select HAS_RAPIDIO
 +      select PPC_EPAPR_HV_PIC
 +      help
 +        This option enables support for the B4 QDS board
 +        The B4 application development system B4 QDS is a complete
 +        debugging environment intended for engineers developing
 +        applications for the B4.
 +
 +endif
  endif # FSL_SOC_BOOKE
  
  config TQM85xx

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-lpc32xx.c
Simple merge

diff --cc drivers/i2c/muxes/Kconfig
index 5faf244d2476bc35f245c067c767226af37a3d05,40062ed83f37884ac2ff59a001ba675d7f28c1b9..f7f9865b8b898864d4d711ada8bb8591ce289529
--- 1/drivers/i2c/muxes/Kconfig
--- 2/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@@ -5,21 -5,9 +5,21 @@@
  menu "Multiplexer I2C Chip support"
        depends on I2C_MUX
  
-       depends on GENERIC_GPIO && OF
 +config I2C_ARB_GPIO_CHALLENGE
 +      tristate "GPIO-based I2C arbitration"
++      depends on GPIOLIB && OF
 +      help
 +        If you say yes to this option, support will be included for an
 +        I2C multimaster arbitration scheme using GPIOs and a challenge &
 +        response mechanism where masters have to claim the bus by asserting
 +        a GPIO.
 +
 +        This driver can also be built as a module.  If so, the module
 +        will be called i2c-arb-gpio-challenge.
 +
  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 --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/misc/Kconfig
Simple merge

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/pinctrl/sh-pfc/Kconfig
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/staging/android/Kconfig
Simple merge

diff --cc drivers/staging/iio/adc/Kconfig
Simple merge

diff --cc drivers/usb/phy/Kconfig
index aab2ab2fbc90d050a474cb39df7563bbfedb8633,65217a5900689028e68a61e28c8011fbc9cbbaea..371d0e74e9094132eb378366858dedd7e654d89f
--- 1/drivers/usb/phy/Kconfig
--- 2/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@@ -85,55 -25,14 +85,55 @@@ config OMAP_USB
          This driver interacts with the "OMAP Control USB Driver" to power
          on/off the PHY.
  
 -config OMAP_CONTROL_USB
 -      tristate "OMAP CONTROL USB Driver"
 +config SAMSUNG_USBPHY
 +      tristate "Samsung USB PHY Driver"
        help
 -        Enable this to add support for the USB part present in the control
 -        module. This driver has API to power on the USB2 PHY and to write to
 -        the mailbox. The mailbox is present only in omap4 and the register to
 -        power on the USB2 PHY is present in OMAP4 and OMAP5. OMAP5 has an
 -        additional register to power on USB3 PHY.
 +        Enable this to support Samsung USB phy helper driver for Samsung SoCs.
 +        This driver provides common interface to interact, for Samsung USB 2.0 PHY
 +        driver and later for Samsung USB 3.0 PHY driver.
 +
 +config SAMSUNG_USB2PHY
 +      tristate "Samsung USB 2.0 PHY controller Driver"
 +      select SAMSUNG_USBPHY
 +      help
 +        Enable this to support Samsung USB 2.0 (High Speed) PHY controller
 +        driver for Samsung SoCs.
 +
 +config SAMSUNG_USB3PHY
 +      tristate "Samsung USB 3.0 PHY controller Driver"
 +      select SAMSUNG_USBPHY
 +      help
 +        Enable this to support Samsung USB 3.0 (Super Speed) phy controller
 +        for samsung SoCs.
 +
 +config TWL4030_USB
 +      tristate "TWL4030 USB Transceiver Driver"
 +      depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
 +      help
 +        Enable this to support the USB OTG transceiver on TWL4030
 +        family chips (including the TWL5030 and TPS659x0 devices).
 +        This transceiver supports high and full speed devices plus,
 +        in host mode, low speed.
 +
 +config TWL6030_USB
 +      tristate "TWL6030 USB Transceiver Driver"
 +      depends on TWL4030_CORE && OMAP_USB2 && USB_MUSB_OMAP2PLUS
 +      help
 +        Enable this to support the USB OTG transceiver on TWL6030
 +        family chips. This TWL6030 transceiver has the VBUS and ID GND
 +        and OTG SRP events capabilities. For all other transceiver functionality
 +        UTMI PHY is embedded in OMAP4430. The internal PHY configurations APIs
 +        are hooked to this driver through platform_data structure.
 +        The definition of internal PHY APIs are in the mach-omap2 layer.
 +
 +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
 +        optionally control of a D+ pullup GPIO as well as a VBUS
 +        current limit regulator.
  
  config USB_ISP1301
        tristate "NXP ISP1301 USB transceiver support"

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/backlight/Kconfig
Simple merge