File tree 3 files changed +20
-6
lines changed
3 files changed +20
-6
lines changed Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ config ARCH_BCM2835
161
161
select GPIOLIB
162
162
select ARM_AMBA
163
163
select ARM_ERRATA_411920 if ARCH_MULTI_V6
164
- select ARM_GIC
164
+ select ARM_GIC if ARCH_MULTI_V7
165
165
select ARM_TIMER_SP804
166
166
select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
167
167
select TIMER_OF
@@ -175,7 +175,7 @@ config ARCH_BCM2835
175
175
select ZONE_DMA if ARM_LPAE
176
176
select MFD_CORE
177
177
help
178
- This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
178
+ This enables support for the Broadcom BCM2711 and BCM283x SoCs.
179
179
This SoC is used in the Raspberry Pi and Roku 2 devices.
180
180
181
181
config ARCH_BCM_53573
Original file line number Diff line number Diff line change @@ -109,19 +109,32 @@ static const char * const bcm2835_compat[] = {
109
109
#ifdef CONFIG_ARCH_MULTI_V7
110
110
"brcm,bcm2836" ,
111
111
"brcm,bcm2837" ,
112
+ #endif
113
+ NULL
114
+ };
115
+
116
+ 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
112
125
"brcm,bcm2711" ,
113
126
// Temporary, for backwards-compatibility with old DTBs
114
127
"brcm,bcm2838" ,
115
128
#endif
116
129
NULL
117
130
};
118
131
119
- DT_MACHINE_START (BCM2835 , "BCM2835 " )
132
+ DT_MACHINE_START (BCM2711 , "BCM2711 " )
120
133
#if defined(CONFIG_ZONE_DMA ) && defined(CONFIG_ARM_LPAE )
121
134
.dma_zone_size = SZ_1G ,
122
135
#endif
123
136
.map_io = bcm2835_map_io ,
124
137
.init_machine = bcm2835_init ,
125
- .dt_compat = bcm2835_compat ,
138
+ .dt_compat = bcm2711_compat ,
126
139
.smp = smp_ops (bcm2836_smp_ops ),
127
140
MACHINE_END
Original file line number Diff line number Diff line change @@ -37,11 +37,12 @@ config ARCH_BCM2835
37
37
select PINCTRL
38
38
select PINCTRL_BCM2835
39
39
select ARM_AMBA
40
+ select ARM_GIC
40
41
select ARM_TIMER_SP804
41
42
select HAVE_ARM_ARCH_TIMER
42
43
help
43
- This enables support for the Broadcom BCM2837 SoC.
44
- This SoC is used in the Raspberry Pi 3 device .
44
+ This enables support for the Broadcom BCM2837 and BCM2711 SoC.
45
+ These SoCs are used in the Raspberry Pi 3 and 4 devices .
45
46
46
47
config ARCH_BCM_IPROC
47
48
bool "Broadcom iProc SoC Family"
You can’t perform that action at this time.
0 commit comments