diff options
| author | Tom Rini <[email protected]> | 2026-04-20 09:31:12 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-04-20 11:43:11 -0600 |
| commit | 5d401bfbdf1da9eb34575b0b15e18757f2b38ca0 (patch) | |
| tree | ef0be8a0a30c5d6b987f193bd6cd551428024725 /dts/upstream/src/arm/broadcom | |
| parent | e3405917a1806971d9e72a94186b299f05581e1a (diff) | |
| parent | b427decccfe983eda4f815ddcf5dcbe733cd04f6 (diff) | |
Subtree merge tag 'v7.0-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
- Remove netc_timerX nodes from arch/arm/dts/imx943-u-boot.dtsi as they
are now upstream
- Move dts/upstream/include/dt-bindings/reset/bcm6318-reset.h to
include/dt-bindings/reset/bcm6318-reset.h as upstream has removed this
file as unused (but we use it).
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'dts/upstream/src/arm/broadcom')
| -rw-r--r-- | dts/upstream/src/arm/broadcom/bcm2711.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dts/upstream/src/arm/broadcom/bcm2711.dtsi b/dts/upstream/src/arm/broadcom/bcm2711.dtsi index c06d9f5e53c..5e3b4bb3939 100644 --- a/dts/upstream/src/arm/broadcom/bcm2711.dtsi +++ b/dts/upstream/src/arm/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>; |