brcm2708: update to latest patches from RPi foundation
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0637-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch
1 From 46a1fe9e384cdb9d0e38fc2d34bc09f589119736 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 4 Sep 2018 11:50:25 +0100
4 Subject: [PATCH 637/773] config: Permit LPAE and PCIE_BRCMSTB on BCM2835
5
6 ---
7 arch/arm/mach-bcm/Kconfig | 4 ++++
8 drivers/pci/controller/Kconfig | 4 ++--
9 2 files changed, 6 insertions(+), 2 deletions(-)
10
11 --- a/arch/arm/mach-bcm/Kconfig
12 +++ b/arch/arm/mach-bcm/Kconfig
13 @@ -161,6 +161,7 @@ config ARCH_BCM2835
14 select GPIOLIB
15 select ARM_AMBA
16 select ARM_ERRATA_411920 if ARCH_MULTI_V6
17 + select ARM_GIC
18 select ARM_TIMER_SP804
19 select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
20 select TIMER_OF
21 @@ -169,6 +170,9 @@ config ARCH_BCM2835
22 select PINCTRL
23 select PINCTRL_BCM2835
24 select MFD_SYSCON if ARCH_MULTI_V7
25 + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
26 + select ZONE_DMA if ARM_LPAE
27 + select MFD_CORE
28 help
29 This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
30 This SoC is used in the Raspberry Pi and Roku 2 devices.
31 --- a/drivers/pci/controller/Kconfig
32 +++ b/drivers/pci/controller/Kconfig
33 @@ -280,9 +280,9 @@ config VMD
34
35 config PCIE_BRCMSTB
36 tristate "Broadcom Brcmstb PCIe platform host driver"
37 - depends on ARCH_BRCMSTB || BMIPS_GENERIC
38 + depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM2835
39 depends on OF
40 - depends on SOC_BRCMSTB
41 + depends on SOC_BRCMSTB || ARCH_BCM2835
42 default ARCH_BRCMSTB || BMIPS_GENERIC
43 help
44 Adds support for Broadcom Settop Box PCIe host controller.