Skip to content

Commit d704f1f

Browse files
arndbarndb
committed
Merge tag 'arm-soc/for-6.5/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM64-based SoCs changes for 6.5, please pull the following: - Krzysztof fixes the BCMBCA DTS files to have correct cache properties - Tony unifies the pinctrl-single pin group(s) for the Stingray SoCs - Aurelien enables the BCM283x DTS files to be built with relocation information to make them usable with DT overlays * tag 'arm-soc/for-6.5/devicetree-arm64' of https://github.com/Broadcom/stblinux: arm64: dts: broadcom: Enable device-tree overlay support for RPi devices arm64: dts: broadcom: Unify pinctrl-single pin group nodes for stingray arm64: dts: broadcom: add missing cache properties Link: https://lore.kernel.org/r/20230619134920.3384844-2-florian.fainelli@broadcom.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 313c22b + 3cdba27 commit d704f1f

11 files changed

Lines changed: 42 additions & 26 deletions

File tree

‎arch/arm64/boot/dts/broadcom/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0
2+
3+
# Enables support for device-tree overlays
4+
DTC_FLAGS := -@
5+
26
dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
37
bcm2711-rpi-4-b.dtb \
48
bcm2711-rpi-cm4-io.dtb \

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
l2: l2-cache0 {
6565
compatible = "cache";
6666
cache-level = <2>;
67+
cache-unified;
6768
};
6869
};
6970

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
L2_0: l2-cache0 {
5353
compatible = "cache";
5454
cache-level = <2>;
55+
cache-unified;
5556
};
5657
};
5758

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
L2_0: l2-cache0 {
3737
compatible = "cache";
3838
cache-level = <2>;
39+
cache-unified;
3940
};
4041
};
4142

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
L2_0: l2-cache0 {
5353
compatible = "cache";
5454
cache-level = <2>;
55+
cache-unified;
5556
};
5657
};
5758

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
L2_0: l2-cache0 {
5353
compatible = "cache";
5454
cache-level = <2>;
55+
cache-unified;
5556
};
5657
};
5758

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
L2_0: l2-cache0 {
3737
compatible = "cache";
3838
cache-level = <2>;
39+
cache-unified;
3940
};
4041
};
4142

‎arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
L2_0: l2-cache0 {
5252
compatible = "cache";
5353
cache-level = <2>;
54+
cache-unified;
5455
};
5556
};
5657

‎arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
CLUSTER0_L2: l2-cache@0 {
8181
compatible = "cache";
8282
cache-level = <2>;
83+
cache-unified;
8384
};
8485
};
8586

‎arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
compatible = "pinctrl-single";
4545
reg = <0x0014029c 0x26c>;
4646
#address-cells = <1>;
47-
#size-cells = <1>;
47+
#size-cells = <0>;
4848
pinctrl-single,register-width = <32>;
4949
pinctrl-single,function-mask = <0xf>;
5050
pinctrl-single,gpio-range = <
@@ -56,14 +56,14 @@
5656
};
5757

5858
/* pinctrl functions */
59-
tsio_pins: pinmux_gpio_14 {
59+
tsio_pins: gpio-14-pins {
6060
pinctrl-single,pins = <
6161
0x038 MODE_NITRO /* tsio_0 */
6262
0x03c MODE_NITRO /* tsio_1 */
6363
>;
6464
};
6565

66-
nor_pins: pinmux_pnor_adv_n {
66+
nor_pins: pnor-adv-n-pins {
6767
pinctrl-single,pins = <
6868
0x0ac MODE_PNOR /* nand_ce1_n */
6969
0x0b0 MODE_PNOR /* nand_ce0_n */
@@ -119,7 +119,7 @@
119119
>;
120120
};
121121

122-
nand_pins: pinmux_nand_ce1_n {
122+
nand_pins: nand-ce1-n-pins {
123123
pinctrl-single,pins = <
124124
0x0ac MODE_NAND /* nand_ce1_n */
125125
0x0b0 MODE_NAND /* nand_ce0_n */
@@ -148,59 +148,59 @@
148148
>;
149149
};
150150

151-
pwm0_pins: pinmux_pwm_0 {
151+
pwm0_pins: pwm-0-pins {
152152
pinctrl-single,pins = <
153153
0x10c MODE_NITRO
154154
>;
155155
};
156156

157-
pwm1_pins: pinmux_pwm_1 {
157+
pwm1_pins: pwm-1-pins {
158158
pinctrl-single,pins = <
159159
0x110 MODE_NITRO
160160
>;
161161
};
162162

163-
pwm2_pins: pinmux_pwm_2 {
163+
pwm2_pins: pwm-2-pins {
164164
pinctrl-single,pins = <
165165
0x114 MODE_NITRO
166166
>;
167167
};
168168

169-
pwm3_pins: pinmux_pwm_3 {
169+
pwm3_pins: pwm-3-pins {
170170
pinctrl-single,pins = <
171171
0x118 MODE_NITRO
172172
>;
173173
};
174174

175-
dbu_rxd_pins: pinmux_uart1_sin_nitro {
175+
dbu_rxd_pins: uart1-sin-nitro-pins {
176176
pinctrl-single,pins = <
177177
0x11c MODE_NITRO /* dbu_rxd */
178178
0x120 MODE_NITRO /* dbu_txd */
179179
>;
180180
};
181181

182-
uart1_pins: pinmux_uart1_sin_nand {
182+
uart1_pins: uart1-sin-nand-pins {
183183
pinctrl-single,pins = <
184184
0x11c MODE_NAND /* uart1_sin */
185185
0x120 MODE_NAND /* uart1_out */
186186
>;
187187
};
188188

189-
uart2_pins: pinmux_uart2_sin {
189+
uart2_pins: uart2-sin-pins {
190190
pinctrl-single,pins = <
191191
0x124 MODE_NITRO /* uart2_sin */
192192
0x128 MODE_NITRO /* uart2_out */
193193
>;
194194
};
195195

196-
uart3_pins: pinmux_uart3_sin {
196+
uart3_pins: uart3-sin-pins {
197197
pinctrl-single,pins = <
198198
0x12c MODE_NITRO /* uart3_sin */
199199
0x130 MODE_NITRO /* uart3_out */
200200
>;
201201
};
202202

203-
i2s_pins: pinmux_i2s_bitclk {
203+
i2s_pins: i2s-bitclk-pins {
204204
pinctrl-single,pins = <
205205
0x134 MODE_NITRO /* i2s_bitclk */
206206
0x138 MODE_NITRO /* i2s_sdout */
@@ -211,7 +211,7 @@
211211
>;
212212
};
213213

214-
qspi_pins: pinumx_qspi_hold_n {
214+
qspi_pins: qspi-hold-n-pins {
215215
pinctrl-single,pins = <
216216
0x14c MODE_NAND /* qspi_hold_n */
217217
0x150 MODE_NAND /* qspi_wp_n */
@@ -222,28 +222,28 @@
222222
>;
223223
};
224224

225-
mdio_pins: pinumx_ext_mdio {
225+
mdio_pins: ext-mdio-pins {
226226
pinctrl-single,pins = <
227227
0x164 MODE_NITRO /* ext_mdio */
228228
0x168 MODE_NITRO /* ext_mdc */
229229
>;
230230
};
231231

232-
i2c0_pins: pinmux_i2c0_sda {
232+
i2c0_pins: i2c0-sda-pins {
233233
pinctrl-single,pins = <
234234
0x16c MODE_NITRO /* i2c0_sda */
235235
0x170 MODE_NITRO /* i2c0_scl */
236236
>;
237237
};
238238

239-
i2c1_pins: pinmux_i2c1_sda {
239+
i2c1_pins: i2c1-sda-pins {
240240
pinctrl-single,pins = <
241241
0x174 MODE_NITRO /* i2c1_sda */
242242
0x178 MODE_NITRO /* i2c1_scl */
243243
>;
244244
};
245245

246-
sdio0_pins: pinmux_sdio0_cd_l {
246+
sdio0_pins: sdio0-cd-l-pins {
247247
pinctrl-single,pins = <
248248
0x17c MODE_NITRO /* sdio0_cd_l */
249249
0x180 MODE_NITRO /* sdio0_clk_sdcard */
@@ -262,7 +262,7 @@
262262
>;
263263
};
264264

265-
sdio1_pins: pinmux_sdio1_cd_l {
265+
sdio1_pins: sdio1-cd-l-pins {
266266
pinctrl-single,pins = <
267267
0x1b4 MODE_NITRO /* sdio1_cd_l */
268268
0x1b8 MODE_NITRO /* sdio1_clk_sdcard */
@@ -281,7 +281,7 @@
281281
>;
282282
};
283283

284-
spi0_pins: pinmux_spi0_sck_nand {
284+
spi0_pins: spi0-sck-nand-pins {
285285
pinctrl-single,pins = <
286286
0x1ec MODE_NITRO /* spi0_sck */
287287
0x1f0 MODE_NITRO /* spi0_rxd */
@@ -290,7 +290,7 @@
290290
>;
291291
};
292292

293-
spi1_pins: pinmux_spi1_sck_nand {
293+
spi1_pins: spi1-sck-nand-pins {
294294
pinctrl-single,pins = <
295295
0x1fc MODE_NITRO /* spi1_sck */
296296
0x200 MODE_NITRO /* spi1_rxd */
@@ -299,14 +299,14 @@
299299
>;
300300
};
301301

302-
nuart_pins: pinmux_uart0_sin_nitro {
302+
nuart_pins: uart0-sin-nitro-pins {
303303
pinctrl-single,pins = <
304304
0x20c MODE_NITRO /* nuart_rxd */
305305
0x210 MODE_NITRO /* nuart_txd */
306306
>;
307307
};
308308

309-
uart0_pins: pinumux_uart0_sin_nand {
309+
uart0_pins: uart0-sin-nand-pins {
310310
pinctrl-single,pins = <
311311
0x20c MODE_NAND /* uart0_sin */
312312
0x210 MODE_NAND /* uart0_out */
@@ -319,7 +319,7 @@
319319
>;
320320
};
321321

322-
drdu2_pins: pinmux_drdu2_overcurrent {
322+
drdu2_pins: drdu2-overcurrent-pins {
323323
pinctrl-single,pins = <
324324
0x22c MODE_NITRO /* drdu2_overcurrent */
325325
0x230 MODE_NITRO /* drdu2_vbus_ppc */
@@ -328,7 +328,7 @@
328328
>;
329329
};
330330

331-
drdu3_pins: pinmux_drdu3_overcurrent {
331+
drdu3_pins: drdu3-overcurrent-pins {
332332
pinctrl-single,pins = <
333333
0x23c MODE_NITRO /* drdu3_overcurrent */
334334
0x240 MODE_NITRO /* drdu3_vbus_ppc */
@@ -337,7 +337,7 @@
337337
>;
338338
};
339339

340-
usb3h_pins: pinmux_usb3h_overcurrent {
340+
usb3h_pins: usb3h-overcurrent-pins {
341341
pinctrl-single,pins = <
342342
0x24c MODE_NITRO /* usb3h_overcurrent */
343343
0x250 MODE_NITRO /* usb3h_vbus_ppc */

0 commit comments

Comments
 (0)