diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-01-28 18:27:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2026-01-28 18:27:13 +0100 |
| commit | b2a29633f489e161a2b2b61e57d029c4e032a8e4 (patch) | |
| tree | b733ea6446569d9d0c3bcc64f6afad71b8defa1a /arch/arm | |
| parent | 8f8f7bccda88adccabec7286f786f661cd6e6738 (diff) | |
| parent | 929dc5b3e06c54f1d19b01c93042174d0e741b99 (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/broadcom/bcm2711.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi index c06d9f5e53c8..5e3b4bb39396 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi @@ -415,7 +415,7 @@ * The firmware will find whether the emmc2bus alias is defined, and if * so, it'll edit the dma-ranges property below accordingly. */ - emmc2bus: emmc2bus { + emmc2bus: emmc2-bus@fe000000 { compatible = "simple-bus"; #address-cells = <2>; #size-cells = <1>; @@ -542,7 +542,7 @@ }; }; - scb { + scb-bus@fc000000 { compatible = "simple-bus"; #address-cells = <2>; #size-cells = <1>; |