Skip to content

Commit b2a2963

Browse files
committed
Merge tag 'arm-soc/for-6.20/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based SoCs DT changes for 6.20, please pull the following: - Rob fixes the simple-bus node names in the BCM2711 .dtsi file * tag 'arm-soc/for-6.20/devicetree' of https://github.com/Broadcom/stblinux: ARM: dts: broadcom: bcm2711: Fix 'simple-bus' node names Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 8f8f7bc + 929dc5b commit b2a2963

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm/boot/dts/broadcom/bcm2711.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
* The firmware will find whether the emmc2bus alias is defined, and if
416416
* so, it'll edit the dma-ranges property below accordingly.
417417
*/
418-
emmc2bus: emmc2bus {
418+
emmc2bus: emmc2-bus@fe000000 {
419419
compatible = "simple-bus";
420420
#address-cells = <2>;
421421
#size-cells = <1>;
@@ -542,7 +542,7 @@
542542
};
543543
};
544544

545-
scb {
545+
scb-bus@fc000000 {
546546
compatible = "simple-bus";
547547
#address-cells = <2>;
548548
#size-cells = <1>;

0 commit comments

Comments
 (0)