diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 13:54:54 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 13:54:54 (GMT) |
commit | fc7c0be08448be0445c310b9a2ece48d85c08c7b (patch) | |
tree | 3474ad8c380ffd11a1f9d54fe075789d79edbab2 /arch/arm64/Kconfig.platforms | |
parent | 623149b00e6b34c43a229faf0dc0ad51f37a6da9 (diff) | |
parent | c4c0e2607abfc86c32a43c9a22b2a256de27dea3 (diff) | |
download | linux-fc7c0be08448be0445c310b9a2ece48d85c08c7b.tar.xz |
Merge tag 'arm-soc/for-4.8/soc-arm64-part2' of http://github.com/Broadcom/stblinux into next/arm64
Merge "Broadcom ARM64-based SoC changes for 4.8 second part" from Florian Fainelli:
- Eric updates the bcm2836 interrupt controller driver not to rely on ARM/Linux specific functions
in preparation for using it on ARM64
- Eric also adds a Kconfig entry for the BCM2835 Raspberry Pi family in the ARM64 Kconfig.platforms
file
- Eric cherry picked a patch from Alexander Graf with Acks from ARM64 maintainers to support different
DMA and bus offsets, required for the Raspberry Pi 3 SoC
* tag 'arm-soc/for-4.8/soc-arm64-part2' of http://github.com/Broadcom/stblinux:
arm64: Add platform selection for BCM2835.
arm64: Allow for different DMA and CPU bus offsets
irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
-rw-r--r-- | arch/arm64/Kconfig.platforms | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 59fc6d9..143761d 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -13,6 +13,19 @@ config ARCH_ALPINE This enables support for the Annapurna Labs Alpine Soc family. +config ARCH_BCM2835 + bool "Broadcom BCM2835 family" + select ARCH_REQUIRE_GPIOLIB + select CLKSRC_OF + select PINCTRL + select PINCTRL_BCM2835 + select ARM_AMBA + select ARM_TIMER_SP804 + select HAVE_ARM_ARCH_TIMER + help + This enables support for the Broadcom BCM2837 SoC. + This SoC is used in the Raspberry Pi 3 device. + config ARCH_BCM_IPROC bool "Broadcom iProc SoC Family" select COMMON_CLK_IPROC |