5647ac0ad4
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. However, it is not trivial to just create a branch to remove it. Over the course of the v3.9 cycle more code referencing GENERIC_GPIO has been added to linux-next that conflicts with this branch. The following must be done to resolve the conflicts when merging this branch into mainline: * "git grep CONFIG_GENERIC_GPIO" should return 0 hits. Matches should be replaced with CONFIG_GPIOLIB * "git grep '\bGENERIC_GPIO\b'" should return 1 hit in the Chinese documentation. * Selectors of GENERIC_GPIO should be turned into selectors of GPIOLIB * definitions of the option in architecture Kconfig code should be deleted. Stephen has 3 merge fixup patches[1] that do the above. They are currently applicable on mainline as of May 2nd. [1] http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg428056.html -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRifUnAAoJEEFnBt12D9kBs2YP/0U6+ia+xYvkVaJc28PDVIzn OReZNcJOYU8D5voxz0voaRD0EdcPwjbMu9Kp9aXMHlk4VxevF+8jCc/us0bIjtO1 VcB5VmSCIhMhxdnBlum11Mk7Vr5MCweyl9NBsypnPt8cl4obMBZHf2yzoodFktNb wtyYlOb6FALtc6iDbOO6dG3w9F7FAOLvskUFzdv89m8mupTsBu9jw9NqFDbJHOex rxq0Sdd+kWF/nkJVcV5Y6jIdletRlhpipefMJ9diexreHvwqh+c4kJEYZaXgB5+m ha95cPbReK1d+RqzM3A8d4irzSVSmq4k7ijI6QkFOr48+AH7XsgKv5so885LKzMN IIXg2Phm9i0H8+ecEvhcc4oIYBHJiEKK54Y0qUD9dqbFoDGPTCSqMHdSSMbpAY+J bIIXlVzj1En3PPNUJLPt8q8Qz6WxCT9mDST3QSGYnD4o90HT+1R9j92RxGL6McOq rUOyJDwmzFvpBvKK4raGdOU435M+ps2NPKKNIRaIGQPPY9rM1kN4YqvhXukEsC9L 3a3+3cQLh7iKxBHncxeQsJfethP1CPkJnzvF9r+ZZLf2rcPH4pbQIE2uO0XnX/nd 5/DKi0nGgAJ//GMMzdo3RiOA5zGFjIZ/KMvfhQldpP6qFJRhqdGi6FPlAcwr1z1n YnCByPwwlvfC4LTXFOGL =xodc -----END PGP SIGNATURE----- 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
123 lines
2.3 KiB
Plaintext
123 lines
2.3 KiB
Plaintext
#
|
|
# Renesas SH and SH Mobile PINCTRL drivers
|
|
#
|
|
|
|
if ARCH_SHMOBILE || SUPERH
|
|
|
|
config PINCTRL_SH_PFC
|
|
# XXX move off the gpio dependency
|
|
depends on GPIOLIB
|
|
select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
|
|
select PINMUX
|
|
select PINCONF
|
|
select GENERIC_PINCONF
|
|
def_bool y
|
|
help
|
|
This enables pin control drivers for SH and SH Mobile platforms
|
|
|
|
config GPIO_SH_PFC
|
|
bool "SuperH PFC GPIO support"
|
|
depends on PINCTRL_SH_PFC && GPIOLIB
|
|
help
|
|
This enables support for GPIOs within the SoC's pin function
|
|
controller.
|
|
|
|
config PINCTRL_PFC_R8A73A4
|
|
def_bool y
|
|
depends on ARCH_R8A73A4
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_R8A7740
|
|
def_bool y
|
|
depends on ARCH_R8A7740
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_R8A7779
|
|
def_bool y
|
|
depends on ARCH_R8A7779
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7203
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7203
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7264
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7264
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7269
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7269
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7372
|
|
def_bool y
|
|
depends on ARCH_SH7372
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH73A0
|
|
def_bool y
|
|
depends on ARCH_SH73A0
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7720
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7720
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7722
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7722
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7723
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7723
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7724
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7724
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7734
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7734
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7757
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7757
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7785
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7785
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SH7786
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SH7786
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
config PINCTRL_PFC_SHX3
|
|
def_bool y
|
|
depends on CPU_SUBTYPE_SHX3
|
|
depends on GPIOLIB
|
|
select PINCTRL_SH_PFC
|
|
|
|
endif
|