aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mayer <markus.mayer@linaro.org>2013-06-27 13:44:34 -0700
committerMarkus Mayer <markus.mayer@linaro.org>2013-07-26 13:10:41 -0700
commit8a4b90a850bed4c16cf824e2eea20557a205236a (patch)
tree43f2c1e432e84469d471020a92243574c6e998c9
parent675198a6271da2ced88ab1b21f005fc21c957af0 (diff)
ARM: bcm281xx: Enable GPIO driverreview/ARM-bcm281xx-GPIO-driver-v1
This patch adds the Kconfig and Makefile glue to compile the GPIO driver for bcm281xx when CONFIG_GPIO_BCM=y. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Reviewed-by: Christian Daudt <csd@broadcom.com> Reviewed-by: Tim Kryger <tim.kryger@linaro.org> Reviewed-by: Matt Porter <matt.porter@linaro.org>
-rw-r--r--arch/arm/mach-bcm/Kconfig2
-rw-r--r--drivers/gpio/Kconfig6
-rw-r--r--drivers/gpio/Makefile1
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index f11289519c3..58191267ed3 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -9,7 +9,7 @@ config ARCH_BCM
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
select GENERIC_TIME
- select GPIO_BCM
+ select GPIO_BCM_KONA
select SPARSE_IRQ
select TICK_ONESHOT
help
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b2450ba1413..87d3a23d205 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -714,6 +714,12 @@ 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 ARCH_BCM
+ help
+ Turn on GPIO support for Broadcom "Kona" chips.
+
comment "USB GPIO expanders:"
config GPIO_VIPERBOARD
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index ef3e983a2f1..fcd0751e09d 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o
obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o
+obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o
obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o