summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorStephen Warren2012-09-28 05:54:21 +0200
committerStephen Warren2012-10-26 04:42:51 +0200
commit805504abdc73cfc745a5fee3d616cdb24bb2a68c (patch)
treeb531ce1bcc94b540d783b8153f90567dd3c735cc /arch/arm/Kconfig
parentARM: bcm2835: implement machine restart hook (diff)
downloadkernel-qcow2-linux-805504abdc73cfc745a5fee3d616cdb24bb2a68c.tar.gz
kernel-qcow2-linux-805504abdc73cfc745a5fee3d616cdb24bb2a68c.tar.xz
kernel-qcow2-linux-805504abdc73cfc745a5fee3d616cdb24bb2a68c.zip
ARM: bcm2835: enable GPIO/pinctrl
Enable GPIO and pinctrl in Kconfig. Add required <mach/gpio.h> for gpiolib. Instantiate the BCM2835 GPIO module in bcm2835.dtsi. Add a pinctrl definition to bcm2835-rpi-b.dts that sets up all of the board's required pinmux configuration. GPIO aren't specified; that's left to gpio_request(). Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 73067efd4845..7cce11a1849e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -336,7 +336,7 @@ config ARCH_AT91
config ARCH_BCM2835
bool "Broadcom BCM2835 family"
- select ARCH_WANT_OPTIONAL_GPIOLIB
+ select ARCH_REQUIRE_GPIOLIB
select ARM_AMBA
select ARM_ERRATA_411920
select ARM_TIMER_SP804
@@ -344,7 +344,10 @@ config ARCH_BCM2835
select COMMON_CLK
select CPU_V6
select GENERIC_CLOCKEVENTS
+ select GENERIC_GPIO
select MULTI_IRQ_HANDLER
+ select PINCTRL
+ select PINCTRL_BCM2835
select SPARSE_IRQ
select USE_OF
help