summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm/Kconfig
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2015-02-24 16:07:55 +0100
committerEric Anholt <eric@anholt.net>2015-12-26 23:34:03 +0100
commit5234c34e4cd7695647ccc1cabb50c3e7720dd3fb (patch)
treea96e1cb833c6cbb42a282b125ec02517e4432cd6 /arch/arm/mach-bcm/Kconfig
parentARM: bcm2835: Add a compat string for bcm2836 machine probe (diff)
downloadlinux-5234c34e4cd7695647ccc1cabb50c3e7720dd3fb.tar.xz
linux-5234c34e4cd7695647ccc1cabb50c3e7720dd3fb.zip
ARM: bcm2835: Add Kconfig support for bcm2836
This should be a complete port of bcm2835 functionality to bcm2836 (Raspberry Pi 2). Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'arch/arm/mach-bcm/Kconfig')
-rw-r--r--arch/arm/mach-bcm/Kconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 8c53c55be1fe..3b2acf4fb760 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -122,17 +122,18 @@ config ARCH_BCM_MOBILE_SMP
comment "Other Architectures"
config ARCH_BCM2835
- bool "Broadcom BCM2835 family" if ARCH_MULTI_V6
+ bool "Broadcom BCM2835 family" if ARCH_MULTI_V6 || ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select ARM_AMBA
- select ARM_ERRATA_411920
+ select ARM_ERRATA_411920 if ARCH_MULTI_V6
select ARM_TIMER_SP804
+ select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
select CLKSRC_OF
select PINCTRL
select PINCTRL_BCM2835
help
- This enables support for the Broadcom BCM2835 SoC. This SoC is
- used in the Raspberry Pi and Roku 2 devices.
+ This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
+ This SoC is used in the Raspberry Pi and Roku 2 devices.
config ARCH_BCM_63XX
bool "Broadcom BCM63xx DSL SoC" if ARCH_MULTI_V7