]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: dts: ls1028a: update the labels
authorMichael Walle <michael@walle.cc>
Wed, 13 Oct 2021 16:14:15 +0000 (18:14 +0200)
committerPriyanka Jain <priyanka.jain@nxp.com>
Tue, 9 Nov 2021 11:48:23 +0000 (17:18 +0530)
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>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
23 files changed:
arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi
arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi
arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi
arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts
arch/arm/dts/fsl-ls1028a-kontron-sl28.dts
arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi
arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi
arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi
arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi
arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi
arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi
arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi
arch/arm/dts/fsl-ls1028a-qds-duart.dts
arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi
arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi
arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi
arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi
arch/arm/dts/fsl-ls1028a-qds.dtsi
arch/arm/dts/fsl-ls1028a-rdb.dts
arch/arm/dts/fsl-ls1028a.dtsi

index 0b1afe37e921859cc85e3d7f5e9f83fb4e027cb3..68a3e0b7aa8f4e64cc94b9ccb717c59bb8ecd6df 100644 (file)
@@ -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 {
        u-boot,dm-pre-reloc;
 };
 
-&esdhc0 {
+&esdhc {
        u-boot,dm-pre-reloc;
 };
 
        u-boot,dm-pre-reloc;
 };
 
-&serial0 {
+&duart0 {
        u-boot,dm-pre-reloc;
 };
 
index 98e8939369251e8b71ce5e9508f7767bba7b4f73..a46e07dc6b2147c540b194d07e04abd519d242ca 100644 (file)
@@ -3,6 +3,6 @@
 
 / {
        aliases {
-               ethernet0 = &enetc1;
+               ethernet0 = &enetc_port1;
        };
 };
index 33d85ed83a60563b7342a4a1128646e0047fe185..ba2e4de96d637a8eecc8a1d877750e64626e4f17 100644 (file)
        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;
index 7a3aa21408ef0d1166d30822e47feea0a9a1d9df..db80874f4e6e75eabaec7453d18778cd87be28e6 100644 (file)
        compatible = "kontron,sl28-var2", "kontron,sl28", "fsl,ls1028a";
 };
 
-&enetc0 {
+&enetc_port0 {
        status = "disabled";
        /delete-property/ phy-handle;
 };
 
-&enetc2 {
+&enetc_port2 {
        status = "okay";
 };
 
 };
 
 &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;
index 879a76415ba92de7ead0b612c5e7822d8411a8af..3d6bf5a0bda26c3fd9bf2b26fdc061b648869cd3 100644 (file)
@@ -3,6 +3,6 @@
 
 / {
        aliases {
-               ethernet0 = &enetc0;
+               ethernet0 = &enetc_port0;
        };
 };
index fce46946828f6cc5ee2c846d600fc124f59e5fd7..5d82973bba2a5ce4945e6d62349a6055684b6c3c 100644 (file)
@@ -3,7 +3,7 @@
 
 / {
        aliases {
-               ethernet0 = &enetc0;
-               ethernet1 = &enetc1;
+               ethernet0 = &enetc_port0;
+               ethernet1 = &enetc_port1;
        };
 };
index b95e082b70ba973e749dc2b2957e749177c3ce45..54d12ab99244b123b71466bd20a484fe53f1a84a 100644 (file)
        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;
index 7f237c39ec0cf24eb5963b2fa249782015b1adaf..9ae70ba5416ee33b5eb1f06a1b51c41e5bf57375 100644 (file)
@@ -14,8 +14,8 @@
        compatible = "kontron,sl28", "fsl,ls1028a";
 
        aliases {
-               serial0 = &serial0;
-               serial1 = &serial1;
+               serial0 = &duart0;
+               serial1 = &duart1;
                serial2 = &lpuart1;
                spi0 = &fspi;
                spi1 = &dspi2;
        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;
        status = "okay";
 };
 
-&mdio0 {
+&enetc_mdio_pf3 {
        status = "okay";
        phy0: ethernet-phy@5 {
                reg = <0x5>;
        status = "okay";
 };
 
-&serial0 {
+&duart0 {
        status = "okay";
 };
 
-&serial1 {
+&duart1 {
        status = "okay";
 };
 
-&usb1 {
+&usb0 {
        status = "okay";
 };
 
-&usb2 {
+&usb1 {
        status = "okay";
 };
index 1f13cf80e6aad180f4f0f4be1242e6742b82a0f9..f4c557e69e6ef7c47a84dda2c93d0e706b530bfe 100644 (file)
@@ -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}>;
index 10375b27516f96bad0ce4ab3e36fb93467efde96..69274ee4e98329ca38391fd449c9ec3a193abce8 100644 (file)
@@ -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}>;
index f18cb39f21942eb27c9c2f3eacdc0b6e7904e318..90da665a3c857b625ca8ad301aef2f48b9b50781 100644 (file)
@@ -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";
 };
index f6561a89eb215edee1d12b106fef730339b57e2b..27c3d655bff27d1be51f460a73e39bea6098bfb2 100644 (file)
@@ -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";
 };
index d9ccd8353bbdf174f9ce68fc66defb5ae57bc869..7d197c31814aa78a4fe5935793df5ec3c819b3d5 100644 (file)
@@ -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}>;
index 0630f1206932457764c1fdf2e424b27c31b4a6b2..992092ec78381fd194c81e89bbe2d4a1d82169e9 100644 (file)
@@ -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";
 };
index 170aacf8c01842f2be6cf40b057cbdea07e86586..a905d77a9a712fd170ccb11021267373f687c809 100644 (file)
@@ -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";
 };
index 83264e0f544716bff6ea2bf2fd7890a9d3c6f993..81db21a947814245b81221368b5d71a658a84e7d 100644 (file)
@@ -10,6 +10,6 @@
 
 / {
        chosen {
-               stdout-path = &serial0;
+               stdout-path = &duart0;
        };
 };
index 1a9288a03726c814127768a89c3a3f580780040b..62e818f099cab7c90d8095c667bc79da5e9d0baf 100644 (file)
@@ -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";
 };
index 544f548b1a9d9a7f2e7f73650724a761b142f37f..6f1f6cb32af733300b51a5a36666b242fb305973 100644 (file)
@@ -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";
 };
index 639796263cbec007130035821f287282e5dc540a..6c0d8b23ef813b41c33b8efcc0cfb5243cc43ae3 100644 (file)
@@ -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";
 };
index 62c5513c2c3d857e45a4e97b921513a58c70f4b8..9af6a5a67490a6cdd58eeb32f7066af4bba6b58d 100644 (file)
@@ -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";
 };
index 335d7b1e4cc85dac38e2fda9ee302af2d2a3890b..babd8445eebbe967eb5af0938600a19420529eec 100644 (file)
        };
 };
 
-&esdhc0 {
+&esdhc {
        status = "okay";
 };
 
                        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 {
        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";
 };
 
index 708182f65c7e667aff56181773198222e77f2981..18ee363d75ba6e0ffaff5eb4c7f72c458bf7d890 100644 (file)
@@ -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";
 };
 
        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";
 };
 
 };
 
 &mscc_felix_port4 {
-       ethernet = <&enetc2>;
+       ethernet = <&enetc_port2>;
        status = "okay";
 };
 
-&mdio0 {
+&enetc_mdio_pf3 {
        status = "okay";
        rdb_phy0: phy@2 {
                reg = <2>;
index ca593c72182fd17376bca431d26e8a3baa7a7aea..e5b5a0dc9f2377cc08242178b80f51172bd05c7c 100644 (file)
                        status = "disabled";
                };
 
-               esdhc0: esdhc@2140000 {
+               esdhc: esdhc@2140000 {
                        compatible = "fsl,esdhc";
                        reg = <0x0 0x2140000 0x0 0x10000>;
                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
 
-               serial0: serial@21c0500 {
+               duart0: serial@21c0500 {
                        device_type = "serial";
                        compatible = "fsl,ns16550", "ns16550a";
                        reg = <0x0 0x21c0500 0x0 0x100>;
                        status = "disabled";
                };
 
-               serial1: serial@21c0600 {
+               duart1: serial@21c0600 {
                        device_type = "serial";
                        compatible = "fsl,ns16550", "ns16550a";
                        reg = <0x0 0x21c0600 0x0 0x100>;
                        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>;
                        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>;
                        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>;
                        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>;
                        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>;
                        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";
                                };
                        };
 
-                       mdio0: pci@0,3 {
+                       enetc_mdio_pf3: pci@0,3 {
                                #address-cells=<0>;
                                #size-cells=<1>;
                                reg = <0x000300 0 0 0 0>;
                                };
                        };
 
-                       enetc6: pci@0,6 {
+                       enetc_port3: pci@0,6 {
                                reg = <0x000600 0 0 0 0>;
                                status = "disabled";
                                phy-mode = "internal";