arm64: dts: broadcom: stingray: Fix 'simple-bus' node names

Fix 'simple-bus' node names to follow the defined pattern. Nodes with 'reg'
or 'ranges' addresses should also have a unit-address.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20260106-dt-dtbs-broadcom-fixes-v1-6-ba45874e4553@kernel.org
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi
index 9666969c8c887dbe32252646e356181039889cbd..cf3cb9199ce4db1a2af1305798787d51bb4aeb0c 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi
@@ -30,7 +30,7 @@
  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-       fs4: fs4 {
+       fs4: fs4-bus@67000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi
index 663e517567464463ebc509c786711fbe7b1fbc5a..fbb2621d1b293b116c60e12d2c092ba1dd58f697 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi
@@ -38,7 +38,7 @@ pcie8: pcie@60400000 {
        phy-names = "pcie-phy";
 };
 
-pcie-ss {
+pcie-ss-bus@40000000 {
        compatible = "simple-bus";
        #address-cells = <1>;
        #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
index 3fa9e57185b2573ea8549de1f478f945c7c29422..850988287e488d100738d92f32b2c871006f30d1 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
@@ -2,7 +2,7 @@
 /*
  *Copyright(c) 2018 Broadcom
  */
-       usb {
+       usb-bus@68500000 {
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <2>;

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
index 9b015b8e1bb108863d56a79ad51c712b5e74f94c..f9f77b2639c5406e47be34b86220f8ce09f12e53 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
@@ -199,7 +199,7 @@
                clock-mult = <1>;
        };
 
-       scr {
+       scr-bus@61000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -303,7 +303,7 @@
                };
        };
 
-       crmu: crmu {
+       crmu: crmu-bus@66400000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -412,7 +412,7 @@
        #include "stingray-pcie.dtsi"
        #include "stingray-usb.dtsi"
 
-       hsls {
+       hsls-bus@68900000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -725,7 +725,7 @@
                };
        };
 
-       tmons {
+       tmons-bus@8f100000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -814,18 +814,18 @@
                };
        };
 
-       nic-hsls {
+       nic-hsls-bus@60800000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
-               ranges = <0x0 0x0  0x0 0x7fffffff>;
+               ranges = <0x0 0x0 0x60800000 0x6fffff>;
 
-               nic_i2c0: i2c@60826100 {
+               nic_i2c0: i2c@26100 {
                        compatible = "brcm,iproc-nic-i2c";
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       reg = <0x60826100 0x100>,
-                             <0x60e00408 0x1000>;
+                       reg = <0x026100 0x100>,
+                             <0x600408 0x1000>;
                        brcm,ape-hsls-addr-mask = <0x03400000>;
                        clock-frequency = <100000>;
                        status = "disabled";