diff options
Diffstat (limited to 'configs/platform-rpi/patches/linux-4.4/0008-ARM-bcm2835-Add-Kconfig-support-for-bcm2836.patch')
| -rw-r--r-- | configs/platform-rpi/patches/linux-4.4/0008-ARM-bcm2835-Add-Kconfig-support-for-bcm2836.patch | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/configs/platform-rpi/patches/linux-4.4/0008-ARM-bcm2835-Add-Kconfig-support-for-bcm2836.patch b/configs/platform-rpi/patches/linux-4.4/0008-ARM-bcm2835-Add-Kconfig-support-for-bcm2836.patch new file mode 100644 index 0000000..18d0f16 --- /dev/null +++ b/configs/platform-rpi/patches/linux-4.4/0008-ARM-bcm2835-Add-Kconfig-support-for-bcm2836.patch @@ -0,0 +1,94 @@ +From: Eric Anholt <eric@anholt.net> +Date: Tue, 24 Feb 2015 15:07:55 +0000 +Subject: [PATCH] ARM: bcm2835: Add Kconfig support for bcm2836 + +This should be a complete port of bcm2835 functionality to bcm2836 +(Raspberry Pi 2). + +v2: Implement Arnd's feedback to not split to ARCH_BCM2836, and + instead use more conditionals in ARCH_BCM2835. Also reduce diff + between 2835 and 2836. + +Signed-off-by: Eric Anholt <eric@anholt.net> +Signed-off-by: Alexander Aring <alex.aring@gmail.com> +--- + arch/arm/Kconfig.debug | 10 ++++++++-- + arch/arm/boot/dts/Makefile | 3 ++- + arch/arm/mach-bcm/Kconfig | 8 ++++---- + 3 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug +index 259c0ca9c99a..957b876fda92 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/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 30bbc3746130..54e8f6bc038f 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -60,7 +60,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ + bcm2835-rpi-b.dtb \ + bcm2835-rpi-b-rev2.dtb \ + bcm2835-rpi-b-plus.dtb \ +- bcm2835-rpi-a-plus.dtb ++ bcm2835-rpi-a-plus.dtb \ ++ bcm2836-rpi-2-b.dtb + dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4708-asus-rt-ac56u.dtb \ + bcm4708-asus-rt-ac68u.dtb \ +diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig +index 8c53c55be1fe..d7cada994295 100644 +--- a/arch/arm/mach-bcm/Kconfig ++++ b/arch/arm/mach-bcm/Kconfig +@@ -122,17 +122,17 @@ 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 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 |