diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/gpio/Kconfig | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 0f04444..b6ed304 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -30,6 +30,10 @@ config ARCH_REQUIRE_GPIOLIB Selecting this from the architecture code will cause the gpiolib code to always get built in. +config GPIO_DEVRES + def_bool y + depends on HAS_IOMEM + menuconfig GPIOLIB bool "GPIO Support" @@ -43,10 +47,6 @@ menuconfig GPIOLIB if GPIOLIB -config GPIO_DEVRES - def_bool y - depends on HAS_IOMEM - config OF_GPIO def_bool y depends on OF @@ -129,7 +129,7 @@ config GPIO_IT8761E config GPIO_EM tristate "Emma Mobile GPIO" - depends on ARM && OF_GPIO + depends on ARM help Say yes here to support GPIO on Renesas Emma Mobile SoCs. @@ -213,7 +213,7 @@ config GPIO_OCTEON config GPIO_PL061 bool "PrimeCell PL061 GPIO support" - depends on ARM_AMBA + depends on ARM && ARM_AMBA select GENERIC_IRQ_CHIP help Say yes here to support the PrimeCell PL061 GPIO device @@ -320,15 +320,6 @@ config GPIO_ICH If unsure, say N. -config GPIO_IOP - tristate "Intel IOP GPIO" - depends on ARM && (ARCH_IOP32X || ARCH_IOP33X) - help - Say yes here to support the GPIO functionality of a number of Intel - IOP32X or IOP33X. - - If unsure, say N. - config GPIO_VX855 tristate "VIA VX855/VX875 GPIO" depends on PCI @@ -369,10 +360,6 @@ config GPIO_GRGPIO Select this to support Aeroflex Gaisler GRGPIO cores from the GRLIB VHDL IP core library. -config GPIO_TB10X - bool - select OF_GPIO - comment "I2C GPIO expanders:" config GPIO_ARIZONA @@ -625,12 +612,12 @@ config GPIO_AMD8111 If unsure, say N -config GPIO_INTEL_MID - bool "Intel Mid GPIO support" +config GPIO_LANGWELL + bool "Intel Langwell/Penwell GPIO support" depends on PCI && X86 select IRQ_DOMAIN help - Say Y here to support Intel Mid GPIO. + Say Y here to support Intel Langwell/Penwell GPIO. config GPIO_PCH tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO" @@ -716,7 +703,7 @@ config GPIO_74X164 comment "AC97 GPIO expanders:" config GPIO_UCB1400 - tristate "Philips UCB1400 GPIO" + bool "Philips UCB1400 GPIO" depends on UCB1400_CORE help This enables support for the Philips UCB1400 GPIO pins. @@ -772,12 +759,6 @@ config GPIO_MSIC Enable support for GPIO on intel MSIC controllers found in intel MID devices -config GPIO_BCM_KONA - bool "Broadcom Kona GPIO" - depends on OF_GPIO - help - Turn on GPIO support for Broadcom "Kona" chips. - comment "USB GPIO expanders:" config GPIO_VIPERBOARD |