[PATCH 08/13] arm64: dts: broadcom: Use preferred node names

[Rob Herring (Arm)]

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 at kernel.org>
---
 arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts         | 4 ++--
 arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts         | 2 +-
 arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi            | 8 ++++----
 arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi   | 2 +-
 arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi | 2 +-
 arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi         | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
index f06472edd4a1..290759ee0078 100644
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
@@ -111,7 +111,7 @@ &ssp0 {
 &ssp1 {
 	status = "okay";
 
-	at25 at 0 {
+	eeprom at 0 {
 		compatible = "atmel,at25";
 		reg = <0>;
 		spi-max-frequency = <5000000>;
@@ -151,7 +151,7 @@ &sdio1 {
 };
 
 &nand {
-	nandcs at 0 {
+	nand at 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 0e134a94e142..be0876648afd 100644
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
@@ -74,7 +74,7 @@ gphy0: eth-phy at 10 {
 };
 
 &nand {
-	nandcs at 0 {
+	nand at 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 9888a1fabd5c..0de9d6265701 100644
--- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
@@ -657,7 +657,7 @@ hwrng: hwrng at 66220000 {
 			reg = <0x66220000 0x28>;
 		};
 
-		sata_phy: sata_phy at 663f0100 {
+		sata_phy: sata-phy at 663f0100 {
 			compatible = "brcm,iproc-ns2-sata-phy";
 			reg = <0x663f0100 0x1f00>,
 			      <0x663f004c 0x10>;
@@ -701,7 +701,7 @@ sata1: sata-port at 1 {
 			};
 		};
 
-		sdio0: sdhci at 66420000 {
+		sdio0: mmc at 66420000 {
 			compatible = "brcm,sdhci-iproc-cygnus";
 			reg = <0x66420000 0x100>;
 			interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>;
@@ -711,7 +711,7 @@ sdio0: sdhci at 66420000 {
 			status = "disabled";
 		};
 
-		sdio1: sdhci at 66430000 {
+		sdio1: mmc at 66430000 {
 			compatible = "brcm,sdhci-iproc-cygnus";
 			reg = <0x66430000 0x100>;
 			interrupts = <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
@@ -721,7 +721,7 @@ sdio1: sdhci at 66430000 {
 			status = "disabled";
 		};
 
-		nand: nand at 66460000 {
+		nand: nand-controller at 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 8fe7325cfbb2..18152b16cfed 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
@@ -88,7 +88,7 @@ &enet {
 
 &nand {
 	status = "okay";
-	nandcs at 0 {
+	nand at 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 46a827521921..b8da71463ad7 100644
--- 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 at 140000 {
+		pinconf: pinctrl at 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 f9f77b2639c5..05139bcb3184 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
@@ -691,7 +691,7 @@ enet: ethernet at 340000 {
 			status = "disabled";
 		};
 
-		nand: nand at 360000 {
+		nand: nand-controller at 360000 {
 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
 			reg = <0x00360000 0x600>,
 			      <0x0050a408 0x600>,
@@ -704,7 +704,7 @@ nand: nand at 360000 {
 			status = "disabled";
 		};
 
-		sdio0: sdhci at 3f1000 {
+		sdio0: mmc at 3f1000 {
 			compatible = "brcm,sdhci-iproc";
 			reg = <0x003f1000 0x100>;
 			interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>;
@@ -714,7 +714,7 @@ sdio0: sdhci at 3f1000 {
 			status = "disabled";
 		};
 
-		sdio1: sdhci at 3f2000 {
+		sdio1: mmc at 3f2000 {
 			compatible = "brcm,sdhci-iproc";
 			reg = <0x003f2000 0x100>;
 			interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;

-- 
2.51.0