projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub...
[cascardo/linux.git]
/
drivers
/
gpio
/
Kconfig
diff --git
a/drivers/gpio/Kconfig
b/drivers/gpio/Kconfig
index
b6ed304
..
0f04444
100644
(file)
--- a/
drivers/gpio/Kconfig
+++ b/
drivers/gpio/Kconfig
@@
-30,10
+30,6
@@
config ARCH_REQUIRE_GPIOLIB
Selecting this from the architecture code will cause the gpiolib
code to always get built in.
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"
menuconfig GPIOLIB
bool "GPIO Support"
@@
-47,6
+43,10
@@
menuconfig GPIOLIB
if GPIOLIB
if GPIOLIB
+config GPIO_DEVRES
+ def_bool y
+ depends on HAS_IOMEM
+
config OF_GPIO
def_bool y
depends on OF
config OF_GPIO
def_bool y
depends on OF
@@
-129,7
+129,7
@@
config GPIO_IT8761E
config GPIO_EM
tristate "Emma Mobile GPIO"
config GPIO_EM
tristate "Emma Mobile GPIO"
- depends on ARM
+ depends on ARM
&& OF_GPIO
help
Say yes here to support GPIO on Renesas Emma Mobile SoCs.
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"
config GPIO_PL061
bool "PrimeCell PL061 GPIO support"
- depends on ARM
&& ARM
_AMBA
+ depends on ARM_AMBA
select GENERIC_IRQ_CHIP
help
Say yes here to support the PrimeCell PL061 GPIO device
select GENERIC_IRQ_CHIP
help
Say yes here to support the PrimeCell PL061 GPIO device
@@
-320,6
+320,15
@@
config GPIO_ICH
If unsure, say N.
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
config GPIO_VX855
tristate "VIA VX855/VX875 GPIO"
depends on PCI
@@
-360,6
+369,10
@@
config GPIO_GRGPIO
Select this to support Aeroflex Gaisler GRGPIO cores from the GRLIB
VHDL IP core library.
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
comment "I2C GPIO expanders:"
config GPIO_ARIZONA
@@
-612,12
+625,12
@@
config GPIO_AMD8111
If unsure, say N
If unsure, say N
-config GPIO_
LANGWELL
- bool "Intel
Langwell/Penwell
GPIO support"
+config GPIO_
INTEL_MID
+ bool "Intel
Mid
GPIO support"
depends on PCI && X86
select IRQ_DOMAIN
help
depends on PCI && X86
select IRQ_DOMAIN
help
- Say Y here to support Intel
Langwell/Penwell
GPIO.
+ Say Y here to support Intel
Mid
GPIO.
config GPIO_PCH
tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"
config GPIO_PCH
tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"
@@
-703,7
+716,7
@@
config GPIO_74X164
comment "AC97 GPIO expanders:"
config GPIO_UCB1400
comment "AC97 GPIO expanders:"
config GPIO_UCB1400
-
bool
"Philips UCB1400 GPIO"
+
tristate
"Philips UCB1400 GPIO"
depends on UCB1400_CORE
help
This enables support for the Philips UCB1400 GPIO pins.
depends on UCB1400_CORE
help
This enables support for the Philips UCB1400 GPIO pins.
@@
-759,6
+772,12
@@
config GPIO_MSIC
Enable support for GPIO on intel MSIC controllers found in
intel MID devices
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
comment "USB GPIO expanders:"
config GPIO_VIPERBOARD