arm64: dts: broadcom: Use preferred node names

Update various node names to use the documented preferred names. Node
names/path aren't considered ABI, so changing them should be safe.

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

diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
index f06472edd4a14b2319a366fbc1e5ec117aaa1d37..290759ee007810057bc141768115eb7123db7164 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
@@ -111,7 +111,7 @@
 &ssp1 {
        status = "okay";
 
-       at25@0 {
+       eeprom@0 {
                compatible = "atmel,at25";
                reg = <0>;
                spi-max-frequency = <5000000>;
@@ -151,7 +151,7 @@
 };
 
 &nand {
-       nandcs@0 {
+       nand@0 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-ecc-mode = "hw";

diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
index 0e134a94e1425f59e10225c1514d83f668adcfcb..be0876648afddf683b994a232261472f4b1de2b9 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
@@ -74,7 +74,7 @@
 };
 
 &nand {
-       nandcs@0 {
+       nand@0 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-ecc-mode = "hw";

diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
index 9888a1fabd5c6dc73fa76dc5ec075db6b5c8bc22..0de9d6265701601d0319be8235783d425e3c442e 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
@@ -657,7 +657,7 @@
                        reg = <0x66220000 0x28>;
                };
 
-               sata_phy: sata_phy@663f0100 {
+               sata_phy: sata-phy@663f0100 {
                        compatible = "brcm,iproc-ns2-sata-phy";
                        reg = <0x663f0100 0x1f00>,
                              <0x663f004c 0x10>;
@@ -701,7 +701,7 @@
                        };
                };
 
-               sdio0: sdhci@66420000 {
+               sdio0: mmc@66420000 {
                        compatible = "brcm,sdhci-iproc-cygnus";
                        reg = <0x66420000 0x100>;
                        interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>;
@@ -711,7 +711,7 @@
                        status = "disabled";
                };
 
-               sdio1: sdhci@66430000 {
+               sdio1: mmc@66430000 {
                        compatible = "brcm,sdhci-iproc-cygnus";
                        reg = <0x66430000 0x100>;
                        interrupts = <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
@@ -721,7 +721,7 @@
                        status = "disabled";
                };
 
-               nand: nand@66460000 {
+               nand: nand-controller@66460000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x66460000 0x600>,
                              <0x67015408 0x600>,

diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
index 8fe7325cfbb2db752ec2ee5c493f9d7e9c8e62a8..18152b16cfedd05df98aff576eca2755c303d704 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
@@ -88,7 +88,7 @@
 
 &nand {
        status = "okay";
-       nandcs@0 {
+       nand@0 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-ecc-mode = "hw";

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi
index 46a82752192156c9e7448e077bb79446ba08a7d9..b8da71463ad773c9cbce5a36f26f8007c4bae617 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi
@@ -32,7 +32,7 @@
 
 #include <dt-bindings/pinctrl/brcm,pinctrl-stingray.h>
 
-               pinconf: pinconf@140000 {
+               pinconf: pinctrl@140000 {
                        compatible = "pinconf-single";
                        reg = <0x00140000 0x250>;
                        pinctrl-single,register-width = <32>;

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
index f9f77b2639c5406e47be34b86220f8ce09f12e53..05139bcb318439aa65ea4023d81f452178cfc251 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
@@ -691,7 +691,7 @@
                        status = "disabled";
                };
 
-               nand: nand@360000 {
+               nand: nand-controller@360000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x00360000 0x600>,
                              <0x0050a408 0x600>,
@@ -704,7 +704,7 @@
                        status = "disabled";
                };
 
-               sdio0: sdhci@3f1000 {
+               sdio0: mmc@3f1000 {
                        compatible = "brcm,sdhci-iproc";
                        reg = <0x003f1000 0x100>;
                        interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>;
@@ -714,7 +714,7 @@
                        status = "disabled";
                };
 
-               sdio1: sdhci@3f2000 {
+               sdio1: mmc@3f2000 {
                        compatible = "brcm,sdhci-iproc";
                        reg = <0x003f2000 0x100>;
                        interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;