brcm2708: organize kernel patches

[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.19 / 950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch b/target/linux/brcm2708/patches-4.19/950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch
deleted file mode 100644 (file)
index 8f990e1..0000000
--- a/target/linux/brcm2708/patches-4.19/950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0e8ed7a892a510383017cdddee7b772473f1f7c8 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 4 Sep 2018 11:50:25 +0100
-Subject: [PATCH 636/806] config: Permit LPAE and PCIE_BRCMSTB on BCM2835
-
----
- arch/arm/mach-bcm/Kconfig      | 4 ++++
- drivers/pci/controller/Kconfig | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
---- a/arch/arm/mach-bcm/Kconfig
-+++ b/arch/arm/mach-bcm/Kconfig
-@@ -161,6 +161,7 @@ config ARCH_BCM2835
-       select GPIOLIB
-       select ARM_AMBA
-       select ARM_ERRATA_411920 if ARCH_MULTI_V6
-+      select ARM_GIC
-       select ARM_TIMER_SP804
-       select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
-       select TIMER_OF
-@@ -169,6 +170,9 @@ config ARCH_BCM2835
-       select PINCTRL
-       select PINCTRL_BCM2835
-       select MFD_SYSCON if ARCH_MULTI_V7
-+      select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-+      select ZONE_DMA if ARM_LPAE
-+      select MFD_CORE
-       help
-         This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
-         This SoC is used in the Raspberry Pi and Roku 2 devices.
---- a/drivers/pci/controller/Kconfig
-+++ b/drivers/pci/controller/Kconfig
-@@ -280,9 +280,9 @@ config VMD
- 
- config PCIE_BRCMSTB
-       tristate "Broadcom Brcmstb PCIe platform host driver"
--      depends on ARCH_BRCMSTB || BMIPS_GENERIC
-+      depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM2835
-       depends on OF
--      depends on SOC_BRCMSTB
-+      depends on SOC_BRCMSTB || ARCH_BCM2835
-       default ARCH_BRCMSTB || BMIPS_GENERIC
-       help
-         Adds support for Broadcom Settop Box PCIe host controller.