aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSherman Yin <syin@broadcom.com>2013-12-20 21:13:35 -0500
committerLinus Walleij <linus.walleij@linaro.org>2014-01-16 08:25:38 -0500
commit54b1aa5a5b166f3e0863adde6cf9d14442fa244c (patch)
tree0739f8d7c62f4736c48253f50079c314f2e03d55 /arch
parent9bb412e557bcc43b3f5bc249830989461a83c875 (diff)
ARM: pinctrl: Add Broadcom Capri pinctrl driver
Adds pinctrl driver for Broadcom Capri (BCM281xx) SoCs. v4: - PINCTRL selected in Kconfig, PINCTRL_CAPRI selected in bcm_defconfig - make use of regmap - change CAPRI_PIN_UPDATE from macro to inline function. - Handle pull-up strength arg in Ohm instead of enum v3: Re-work driver to be based on generic pin config. Moved config selection from Kconfig to bcm_defconfig. v2: Use hyphens instead of underscore in DT property names. Signed-off-by: Sherman Yin <syin@broadcom.com> Reviewed-by: Christian Daudt <bcm@fixthebug.org> Reviewed-by: Matt Porter <matt.porter@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/bcm_defconfig1
-rw-r--r--arch/arm/mach-bcm/Kconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 287ac1d7aac7..bede51171d98 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -126,3 +126,4 @@ CONFIG_CRC_ITU_T=y
126CONFIG_CRC7=y 126CONFIG_CRC7=y
127CONFIG_XZ_DEC=y 127CONFIG_XZ_DEC=y
128CONFIG_AVERAGE=y 128CONFIG_AVERAGE=y
129CONFIG_PINCTRL_CAPRI=y
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 9fe6d88737ed..b1aa6a9b3bd1 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -25,6 +25,7 @@ config ARCH_BCM_MOBILE
25 select TICK_ONESHOT 25 select TICK_ONESHOT
26 select CACHE_L2X0 26 select CACHE_L2X0
27 select HAVE_ARM_ARCH_TIMER 27 select HAVE_ARM_ARCH_TIMER
28 select PINCTRL
28 help 29 help
29 This enables support for systems based on Broadcom mobile SoCs. 30 This enables support for systems based on Broadcom mobile SoCs.
30 It currently supports the 'BCM281XX' family, which includes 31 It currently supports the 'BCM281XX' family, which includes