mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 30b82c39658de4a6d409f20c963c7b9b2ab92e8e Mon Sep 17 00:00:00 2001
|
|
From: Stefan Wahren <wahrenst@gmx.net>
|
|
Date: Fri, 27 Dec 2019 11:40:56 +0100
|
|
Subject: [PATCH 0192/1085] ARM: bcm: Backport BCM2711 support from upstream
|
|
|
|
Make the BCM2711 a different machine, but keep it in board_bcm2835.
|
|
|
|
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
|
|
---
|
|
arch/arm/mach-bcm/board_bcm2835.c | 17 +++++++++++++++--
|
|
1 file changed, 15 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/mach-bcm/board_bcm2835.c
|
|
+++ b/arch/arm/mach-bcm/board_bcm2835.c
|
|
@@ -109,17 +109,30 @@ static const char * const bcm2835_compat
|
|
#ifdef CONFIG_ARCH_MULTI_V7
|
|
"brcm,bcm2836",
|
|
"brcm,bcm2837",
|
|
- "brcm,bcm2711",
|
|
#endif
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(BCM2835, "BCM2835")
|
|
+ .map_io = bcm2835_map_io,
|
|
+ .init_machine = bcm2835_init,
|
|
+ .dt_compat = bcm2835_compat,
|
|
+ .smp = smp_ops(bcm2836_smp_ops),
|
|
+MACHINE_END
|
|
+
|
|
+static const char * const bcm2711_compat[] = {
|
|
+#ifdef CONFIG_ARCH_MULTI_V7
|
|
+ "brcm,bcm2711",
|
|
+#endif
|
|
+ NULL
|
|
+};
|
|
+
|
|
+DT_MACHINE_START(BCM2711, "BCM2711")
|
|
#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
|
|
.dma_zone_size = SZ_1G,
|
|
#endif
|
|
.map_io = bcm2835_map_io,
|
|
.init_machine = bcm2835_init,
|
|
- .dt_compat = bcm2835_compat,
|
|
+ .dt_compat = bcm2711_compat,
|
|
.smp = smp_ops(bcm2836_smp_ops),
|
|
MACHINE_END
|