Skip to content

Commit 04f5605

Browse files
Phil Elwellpopcornmix
Phil Elwell
authored andcommitted
ARM: bcm: Backport BCM2711 support from upstream
Make the BCM2711 a different machine, but keep it in board_bcm2835. Signed-off-by: Stefan Wahren <[email protected]>
1 parent 3db57e6 commit 04f5605

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

arch/arm/mach-bcm/board_bcm2835.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,25 @@ static const char * const bcm2835_compat[] = {
114114
};
115115

116116
DT_MACHINE_START(BCM2835, "BCM2835")
117+
.map_io = bcm2835_map_io,
118+
.init_machine = bcm2835_init,
119+
.dt_compat = bcm2835_compat,
120+
.smp = smp_ops(bcm2836_smp_ops),
121+
MACHINE_END
122+
123+
static const char * const bcm2711_compat[] = {
124+
#ifdef CONFIG_ARCH_MULTI_V7
125+
"brcm,bcm2711",
126+
#endif
127+
NULL
128+
};
129+
130+
DT_MACHINE_START(BCM2711, "BCM2711")
117131
#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
118132
.dma_zone_size = SZ_1G,
119133
#endif
120134
.map_io = bcm2835_map_io,
121135
.init_machine = bcm2835_init,
122-
.dt_compat = bcm2835_compat,
136+
.dt_compat = bcm2711_compat,
123137
.smp = smp_ops(bcm2836_smp_ops),
124138
MACHINE_END

0 commit comments

Comments
 (0)