[PATCH v5 16/28] arm: dts: ls1028a: update the labels

13 Oct 2021

Update the labels of the nodes to match the kernel ones.
Signed-off-by: Michael Walle michael@walle.cc
Reviewed-by: Vladimir Oltean vladimir.oltean@nxp.com
Tested-by: Vladimir Oltean vladimir.oltean@nxp.com
---
 .../dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi  | 10 +++----
 .../fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi |  2 +-
 .../arm/dts/fsl-ls1028a-kontron-sl28-var1.dts |  6 ++---
 .../arm/dts/fsl-ls1028a-kontron-sl28-var2.dts |  8 +++---
 .../fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi |  2 +-
 .../fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi |  4 +--
 .../arm/dts/fsl-ls1028a-kontron-sl28-var4.dts |  4 +--
 arch/arm/dts/fsl-ls1028a-kontron-sl28.dts     | 22 ++++++++--------
 .../dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi   |  2 +-
 .../dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi   |  2 +-
 .../dts/fsl-ls1028a-qds-7777-sch-30841.dtsi   |  4 +--
 .../dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi  |  4 +--
 .../dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi   |  2 +-
 .../fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi  |  4 +--
 .../dts/fsl-ls1028a-qds-9999-sch-24801.dtsi   |  4 +--
 arch/arm/dts/fsl-ls1028a-qds-duart.dts        |  2 +-
 .../fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi  |  4 +--
 .../fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi  |  4 +--
 .../dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi   |  4 +--
 .../dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi   |  4 +--
 arch/arm/dts/fsl-ls1028a-qds.dtsi             | 16 ++++++------
 arch/arm/dts/fsl-ls1028a-rdb.dts              | 22 ++++++++--------
 arch/arm/dts/fsl-ls1028a.dtsi                 | 26 +++++++++----------
 23 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
index fa4c05212a..42bd3138b2 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
@@ -5,13 +5,13 @@
 / {
    aliases {
    	mmc0 = &esdhc1;
-		mmc1 = &esdhc0;
+		mmc1 = &esdhc;
    	i2c0 = &i2c0;
    	i2c1 = &i2c3;
    	i2c2 = &i2c4;
    	rtc0 = &rtc;
-		ethernet2 = &enetc2;
-		ethernet3 = &enetc6;
+		ethernet2 = &enetc_port2;
+		ethernet3 = &enetc_port3;
    };
binman: binman {
@@ -250,7 +250,7 @@
    u-boot,dm-pre-reloc;
 };
-&esdhc0 {
+&esdhc {
    u-boot,dm-pre-reloc;
 };
@@ -262,7 +262,7 @@
    u-boot,dm-pre-reloc;
 };
-&serial0 {
+&duart0 {
    u-boot,dm-pre-reloc;
 };
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi
index 98e8939369..a46e07dc6b 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi
@@ -3,6 +3,6 @@
/ {
    aliases {
-		ethernet0 = &enetc1;
+		ethernet0 = &enetc_port1;
    };
 };
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
index 33d85ed83a..ba2e4de96d 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
@@ -21,19 +21,19 @@
    compatible = "kontron,sl28-var1", "kontron,sl28", "fsl,ls1028a";
 };
-&enetc0 {
+&enetc_port0 {
    status = "disabled";
    /delete-property/ phy-handle;
 };
-&enetc1 {
+&enetc_port1 {
    phy-handle = <&phy0>;
    phy-mode = "rgmii-id";
    status = "okay";
 };
/delete-node/ &phy0;
-&mdio0 {
+&enetc_mdio_pf3 {
    phy0: ethernet-phy@4 {
    	reg = <0x4>;
    	eee-broken-1000t;
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
index 7a3aa21408..db80874f4e 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
@@ -17,12 +17,12 @@
    compatible = "kontron,sl28-var2", "kontron,sl28", "fsl,ls1028a";
 };
-&enetc0 {
+&enetc_port0 {
    status = "disabled";
    /delete-property/ phy-handle;
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -45,12 +45,12 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
/delete-node/ &phy0;
-&mdio0 {
+&enetc_mdio_pf3 {
    phy0: ethernet-phy@5 {
    	reg = <0x5>;
    	eee-broken-1000t;
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi
index 879a76415b..3d6bf5a0bd 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi
@@ -3,6 +3,6 @@
/ {
    aliases {
-		ethernet0 = &enetc0;
+		ethernet0 = &enetc_port0;
    };
 };
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi
index fce4694682..5d82973bba 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi
@@ -3,7 +3,7 @@
/ {
    aliases {
-		ethernet0 = &enetc0;
-		ethernet1 = &enetc1;
+		ethernet0 = &enetc_port0;
+		ethernet1 = &enetc_port1;
    };
 };
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts
index b95e082b70..54d12ab992 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts
@@ -18,13 +18,13 @@
    compatible = "kontron,sl28-var4", "kontron,sl28", "fsl,ls1028a";
 };
-&enetc1 {
+&enetc_port1 {
    phy-handle = <&phy1>;
    phy-mode = "rgmii-id";
    status = "okay";
 };
-&mdio0 {
+&enetc_mdio_pf3 {
    phy1: ethernet-phy@4 {
    	reg = <0x4>;
    	eee-broken-1000t;
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts
index 7f237c39ec..9ae70ba541 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts
@@ -14,8 +14,8 @@
    compatible = "kontron,sl28", "fsl,ls1028a";
aliases {
-		serial0 = &serial0;
-		serial1 = &serial1;
+		serial0 = &duart0;
+		serial1 = &duart1;
    	serial2 = &lpuart1;
    	spi0 = &fspi;
    	spi1 = &dspi2;
@@ -30,21 +30,21 @@
    status = "okay";
 };
-&enetc0 {
+&enetc_port0 {
    phy-handle = <&phy0>;
    phy-mode = "sgmii";
    status = "okay";
 };
-&enetc2 {
+&enetc_port2 {
    status = "disabled";
 };
-&enetc6 {
+&enetc_port3 {
    status = "disabled";
 };
-&esdhc0 {
+&esdhc {
    sd-uhs-sdr104;
    sd-uhs-sdr50;
    sd-uhs-sdr25;
@@ -108,7 +108,7 @@
    status = "okay";
 };
-&mdio0 {
+&enetc_mdio_pf3 {
    status = "okay";
    phy0: ethernet-phy@5 {
    	reg = <0x5>;
@@ -121,18 +121,18 @@
    status = "okay";
 };
-&serial0 {
+&duart0 {
    status = "okay";
 };
-&serial1 {
+&duart1 {
    status = "okay";
 };
-&usb1 {
+&usb0 {
    status = "okay";
 };
-&usb2 {
+&usb1 {
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi
index 1f13cf80e6..f4c557e69e 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi
@@ -13,7 +13,7 @@
    #include "fsl-sch-30842.dtsi"
 };
-&enetc0 {
+&enetc_port0 {
    status = "okay";
    phy-mode = "usxgmii";
    phy-handle = <&{/soc/i2c@2000000/fpga@66/mux-mdio@54/mdio@40/phy@02}>;
diff --git a/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi
index 10375b2751..69274ee4e9 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi
@@ -12,7 +12,7 @@
    #include "fsl-sch-30842.dtsi"
 };
-&enetc0 {
+&enetc_port0 {
    status = "okay";
    phy-mode = "2500base-x";
    phy-handle = <&{/soc/i2c@2000000/fpga@66/mux-mdio@54/mdio@40/phy@02}>;
diff --git a/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi b/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi
index f18cb39f21..90da665a3c 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi
@@ -20,7 +20,7 @@
 #include "fsl-sch-30841.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -53,6 +53,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi b/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi
index f6561a89eb..27c3d655bf 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi
@@ -9,7 +9,7 @@
 #include "fsl-sch-30841.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -30,6 +30,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi b/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi
index d9ccd8353b..7d197c3181 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi
@@ -12,7 +12,7 @@
    #include "fsl-sch-24801.dtsi"
 };
-&enetc0 {
+&enetc_port0 {
    status = "okay";
    phy-mode = "sgmii";
    phy-handle = <&{/soc/i2c@2000000/fpga@66/mux-mdio@54/mdio@40/phy@1c}>;
diff --git a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi
index 0630f12069..992092ec78 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi
@@ -34,7 +34,7 @@
    #include "fsl-sch-24801.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -67,6 +67,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi
index 170aacf8c0..a905d77a9a 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi
@@ -19,7 +19,7 @@
    #include "fsl-sch-24801.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -52,6 +52,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-duart.dts b/arch/arm/dts/fsl-ls1028a-qds-duart.dts
index 83264e0f54..81db21a947 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-duart.dts
+++ b/arch/arm/dts/fsl-ls1028a-qds-duart.dts
@@ -10,6 +10,6 @@
/ {
    chosen {
-		stdout-path = &serial0;
+		stdout-path = &duart0;
    };
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi b/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi
index 1a9288a037..62e818f099 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi
@@ -19,7 +19,7 @@
 #include "fsl-sch-30841.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -52,6 +52,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi b/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi
index 544f548b1a..6f1f6cb32a 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi
@@ -13,7 +13,7 @@
    #include "fsl-sch-28021.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -46,6 +46,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi
index 639796263c..6c0d8b23ef 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi
@@ -9,7 +9,7 @@
 #include "fsl-sch-30842.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -24,6 +24,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi
index 62c5513c2c..9af6a5a674 100644
--- a/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi
@@ -9,7 +9,7 @@
 #include "fsl-sch-30842.dtsi"
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -24,6 +24,6 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-qds.dtsi b/arch/arm/dts/fsl-ls1028a-qds.dtsi
index 335d7b1e4c..babd8445ee 100644
--- a/arch/arm/dts/fsl-ls1028a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds.dtsi
@@ -105,7 +105,7 @@
    };
 };
-&esdhc0 {
+&esdhc {
    status = "okay";
 };
@@ -144,7 +144,7 @@
    		reg = <0x54>;
    		#mux-control-cells = <1>;
    		mux-reg-masks = <0x54 0xf0>;
-			mdio-parent-bus = <&mdio0>;
+			mdio-parent-bus = <&enetc_mdio_pf3>;
/* on-board MDIO with a single RGMII PHY */
    		mdio@00 {
@@ -232,29 +232,29 @@
    status = "okay";
 };
-&serial0 {
+&duart0 {
    status = "okay";
 };
-&serial1 {
+&duart1 {
    status = "okay";
 };
-&usb1 {
+&usb0 {
    status = "okay";
 };
-&usb2 {
+&usb1 {
    status = "okay";
 };
-&enetc1 {
+&enetc_port1 {
    status = "okay";
    phy-mode = "rgmii-id";
    phy-handle = <&qds_phy0>;
 };
-&mdio0 {
+&enetc_mdio_pf3 {
    status = "okay";
 };
diff --git a/arch/arm/dts/fsl-ls1028a-rdb.dts b/arch/arm/dts/fsl-ls1028a-rdb.dts
index 708182f65c..18ee363d75 100644
--- a/arch/arm/dts/fsl-ls1028a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1028a-rdb.dts
@@ -15,8 +15,8 @@
    compatible = "fsl,ls1028a-rdb", "fsl,ls1028a";
    aliases {
    	spi0 = &fspi;
-		ethernet0 = &enetc0;
-		ethernet1 = &enetc2;
+		ethernet0 = &enetc_port0;
+		ethernet1 = &enetc_port2;
    	ethernet2 = &mscc_felix_port0;
    	ethernet3 = &mscc_felix_port1;
    	ethernet4 = &mscc_felix_port2;
@@ -36,7 +36,7 @@
    status = "okay";
 };
-&esdhc0 {
+&esdhc {
    status = "okay";
 };
@@ -114,29 +114,29 @@
    status = "okay";
 };
-&serial0 {
+&duart0 {
    status = "okay";
 };
-&serial1 {
+&duart1 {
    status = "okay";
 };
-&usb1 {
+&usb0 {
    status = "okay";
 };
-&usb2 {
+&usb1 {
    status = "okay";
 };
-&enetc0 {
+&enetc_port0 {
    status = "okay";
    phy-mode = "sgmii";
    phy-handle = <&rdb_phy0>;
 };
-&enetc2 {
+&enetc_port2 {
    status = "okay";
 };
@@ -173,11 +173,11 @@
 };
&mscc_felix_port4 {
-	ethernet = <&enetc2>;
+	ethernet = <&enetc_port2>;
    status = "okay";
 };
-&mdio0 {
+&enetc_mdio_pf3 {
    status = "okay";
    rdb_phy0: phy@2 {
    	reg = <2>;
diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi
index ca593c7218..e5b5a0dc9f 100644
--- a/arch/arm/dts/fsl-ls1028a.dtsi
+++ b/arch/arm/dts/fsl-ls1028a.dtsi
@@ -196,7 +196,7 @@
    		status = "disabled";
    	};
-		esdhc0: esdhc@2140000 {
+		esdhc: esdhc@2140000 {
    		compatible = "fsl,esdhc";
    		reg = <0x0 0x2140000 0x0 0x10000>;
    		interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
@@ -215,7 +215,7 @@
    		status = "disabled";
    	};
-		serial0: serial@21c0500 {
+		duart0: serial@21c0500 {
    		device_type = "serial";
    		compatible = "fsl,ns16550", "ns16550a";
    		reg = <0x0 0x21c0500 0x0 0x100>;
@@ -223,7 +223,7 @@
    		status = "disabled";
    	};
-		serial1: serial@21c0600 {
+		duart1: serial@21c0600 {
    		device_type = "serial";
    		compatible = "fsl,ns16550", "ns16550a";
    		reg = <0x0 0x21c0600 0x0 0x100>;
@@ -291,7 +291,7 @@
    		status = "disabled";
    	};
-		gpio0: gpio@2300000 {
+		gpio1: gpio@2300000 {
    		compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
    		reg = <0x0 0x2300000 0x0 0x10000>;
    		interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
@@ -302,7 +302,7 @@
    		little-endian;
    	};
-		gpio1: gpio@2310000 {
+		gpio2: gpio@2310000 {
    		compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
    		reg = <0x0 0x2310000 0x0 0x10000>;
    		interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
@@ -313,7 +313,7 @@
    		little-endian;
    	};
-		gpio2: gpio@2320000 {
+		gpio3: gpio@2320000 {
    		compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
    		reg = <0x0 0x2320000 0x0 0x10000>;
    		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
@@ -324,7 +324,7 @@
    		little-endian;
    	};
-		usb1: usb3@3100000 {
+		usb0: usb3@3100000 {
    		compatible = "fsl,layerscape-dwc3";
    		reg = <0x0 0x3100000 0x0 0x10000>;
    		interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
@@ -332,7 +332,7 @@
    		status = "disabled";
    	};
-		usb2: usb3@3110000 {
+		usb1: usb3@3110000 {
    		compatible = "fsl,layerscape-dwc3";
    		reg = <0x0 0x3110000 0x0 0x10000>;
    		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
@@ -396,17 +396,17 @@
    		device_type = "pci";
    		ranges = <0x82000000 0x0 0x00000000 0x1 0xf8000000 0x0 0x160000>;
-			enetc0: pci@0,0 {
+			enetc_port0: pci@0,0 {
    			reg = <0x000000 0 0 0 0>;
    			status = "disabled";
    		};
-			enetc1: pci@0,1 {
+			enetc_port1: pci@0,1 {
    			reg = <0x000100 0 0 0 0>;
    			status = "disabled";
    		};
-			enetc2: pci@0,2 {
+			enetc_port2: pci@0,2 {
    			reg = <0x000200 0 0 0 0>;
    			status = "disabled";
    			phy-mode = "internal";
@@ -417,7 +417,7 @@
    			};
    		};
-			mdio0: pci@0,3 {
+			enetc_mdio_pf3: pci@0,3 {
    			#address-cells=<0>;
    			#size-cells=<1>;
    			reg = <0x000300 0 0 0 0>;
@@ -482,7 +482,7 @@
    			};
    		};
-			enetc6: pci@0,6 {
+			enetc_port3: pci@0,6 {
    			reg = <0x000600 0 0 0 0>;
    			status = "disabled";
    			phy-mode = "internal";
-- 
2.30.2


    