77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
From: Eric Anholt <eric@anholt.net>
|
|
Date: Tue, 24 Feb 2015 15:07:55 +0000
|
|
Subject: [3/3] ARM: bcm2835: Add Kconfig support for bcm2836
|
|
Origin: https://github.com/anholt/linux/commit/5234c34e4cd7695647ccc1cabb50c3e7720dd3fb
|
|
|
|
This should be a complete port of bcm2835 functionality to bcm2836
|
|
(Raspberry Pi 2).
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
arch/arm/Kconfig.debug | 10 ++++++++--
|
|
arch/arm/mach-bcm/Kconfig | 9 +++++----
|
|
2 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
|
|
index 259c0ca..957b876 100644
|
|
--- a/arch/arm/Kconfig.debug
|
|
+++ b/arch/arm/Kconfig.debug
|
|
@@ -143,7 +143,12 @@ choice
|
|
|
|
config DEBUG_BCM2835
|
|
bool "Kernel low-level debugging on BCM2835 PL011 UART"
|
|
- depends on ARCH_BCM2835
|
|
+ depends on ARCH_BCM2835 && ARCH_MULTI_V6
|
|
+ select DEBUG_UART_PL01X
|
|
+
|
|
+ config DEBUG_BCM2836
|
|
+ bool "Kernel low-level debugging on BCM2836 PL011 UART"
|
|
+ depends on ARCH_BCM2835 && ARCH_MULTI_V7
|
|
select DEBUG_UART_PL01X
|
|
|
|
config DEBUG_BCM_5301X
|
|
@@ -1402,6 +1407,7 @@ config DEBUG_UART_PHYS
|
|
default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
|
|
default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
|
|
default 0x20201000 if DEBUG_BCM2835
|
|
+ default 0x3f201000 if DEBUG_BCM2836
|
|
default 0x3e000000 if DEBUG_BCM_KONA_UART
|
|
default 0x4000e400 if DEBUG_LL_UART_EFM32
|
|
default 0x40081000 if DEBUG_LPC18XX_UART0
|
|
@@ -1485,7 +1491,7 @@ config DEBUG_UART_VIRT
|
|
default 0xf0000be0 if ARCH_EBSA110
|
|
default 0xf0010000 if DEBUG_ASM9260_UART
|
|
default 0xf01fb000 if DEBUG_NOMADIK_UART
|
|
- default 0xf0201000 if DEBUG_BCM2835
|
|
+ default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836
|
|
default 0xf1000300 if DEBUG_BCM_5301X
|
|
default 0xf1002000 if DEBUG_MT8127_UART0
|
|
default 0xf1006000 if DEBUG_MT6589_UART0
|
|
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
|
|
index 8c53c55..3b2acf4 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
|