arm64: dts: freescale: move aliases from imx93.dtsi to board dts

The aliases is board level property rather than soc property, so move
these to each boards.

Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Joy Zou <joy.zou@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
index e24e12f04526c3a08c0bdc6134297fb010e6e926..44566e03be653f29cbbd1b9d5bb6da44341ea27a 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
@@ -12,6 +12,25 @@
        model = "NXP i.MX93 11X11 EVK board";
        compatible = "fsl,imx93-11x11-evk", "fsl,imx93";
 
+       aliases {
+               ethernet0 = &fec;
+               ethernet1 = &eqos;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               i2c2 = &lpi2c3;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
+               rtc0 = &bbnsm_rtc;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
+               serial2 = &lpuart3;
+               serial3 = &lpuart4;
+               serial4 = &lpuart5;
+       };
+
        chosen {
                stdout-path = &lpuart1;
        };

diff --git a/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts b/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts
index 8c5769f90746f7a1f44cd25cc7e9316a8ff36730..f9eebd27d640cf467794afea2c079231414d74d8 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts
@@ -12,6 +12,21 @@
        model = "NXP i.MX93 14X14 EVK board";
        compatible = "fsl,imx93-14x14-evk", "fsl,imx93";
 
+       aliases {
+               ethernet0 = &fec;
+               ethernet1 = &eqos;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               i2c2 = &lpi2c3;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
+               rtc0 = &bbnsm_rtc;
+               serial0 = &lpuart1;
+       };
+
        chosen {
                stdout-path = &lpuart1;
        };

diff --git a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts b/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts
index f6f8d105b737e6db5962202777d05a031aa0d18c..0852067eab2cb8d2f1bbf0d8c2595a5002f950cc 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts
@@ -17,6 +17,24 @@
                compatible = "linux,bt-sco";
        };
 
+       aliases {
+               ethernet0 = &fec;
+               ethernet1 = &eqos;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
+               rtc0 = &bbnsm_rtc;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
+               serial2 = &lpuart3;
+               serial3 = &lpuart4;
+               serial4 = &lpuart5;
+       };
+
        chosen {
                stdout-path = &lpuart1;
        };

diff --git a/arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts b/arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts
index c3d2ddd887fdf0863d50b6ff1bde6193d448d409..4620c070f4d762d00059ba666db8f9bf102c0244 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts
@@ -14,6 +14,27 @@
        aliases {
                ethernet0 = &fec;
                ethernet1 = &eqos;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
+               serial2 = &lpuart3;
+               serial3 = &lpuart4;
+               serial4 = &lpuart5;
+               serial5 = &lpuart6;
+               serial6 = &lpuart7;
+               spi0 = &lpspi1;
+               spi1 = &lpspi2;
+               spi2 = &lpspi3;
+               spi3 = &lpspi4;
+               spi4 = &lpspi5;
+               spi5 = &lpspi6;
+               spi6 = &lpspi7;
+               spi7 = &lpspi8;
        };
 
        leds {

diff --git a/arch/arm64/boot/dts/freescale/imx93-phyboard-nash.dts b/arch/arm64/boot/dts/freescale/imx93-phyboard-nash.dts
index 71a0e9f270af2edd91d429c47614738bb7f4d6db..3f9efa32cddc894b5cb9f624c780ea7a77dba9d7 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-phyboard-nash.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-phyboard-nash.dts
@@ -19,8 +19,29 @@
 
        aliases {
                ethernet1 = &eqos;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
                rtc0 = &i2c_rtc;
                rtc1 = &bbnsm_rtc;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
+               serial2 = &lpuart3;
+               serial3 = &lpuart4;
+               serial4 = &lpuart5;
+               serial5 = &lpuart6;
+               serial6 = &lpuart7;
+               spi0 = &lpspi1;
+               spi1 = &lpspi2;
+               spi2 = &lpspi3;
+               spi3 = &lpspi4;
+               spi4 = &lpspi5;
+               spi5 = &lpspi6;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/freescale/imx93-phyboard-segin.dts b/arch/arm64/boot/dts/freescale/imx93-phyboard-segin.dts
index 6f1374f5757fdc2bb88bb422f58ac725d97b65d3..802d96b19e4ccc173a458abc35b6e91db8423690 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-phyboard-segin.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-phyboard-segin.dts
@@ -19,8 +19,17 @@
 
        aliases {
                ethernet1 = &eqos;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
                rtc0 = &i2c_rtc;
                rtc1 = &bbnsm_rtc;
+               serial0 = &lpuart1;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba91xxca.dts b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba91xxca.dts
index 9dbf41cf394bf6f1657998c9429ba2d647640e67..2673d9dccbf4b5fc80549628b48790a7c47ac49f 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba91xxca.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba91xxca.dts
@@ -27,8 +27,19 @@
                eeprom0 = &eeprom0;
                ethernet0 = &eqos;
                ethernet1 = &fec;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               i2c2 = &lpi2c3;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
                rtc0 = &pcf85063;
                rtc1 = &bbnsm_rtc;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
        };
 
        backlight: backlight {

diff --git a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxca.dts b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxca.dts
index 137b8ed242a2beabb4cb661fefac8735b0693a5d..4760d07ea24b595ecb61a8822bb0d6feb828b5f0 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxca.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxca.dts
@@ -28,8 +28,33 @@
                eeprom0 = &eeprom0;
                ethernet0 = &eqos;
                ethernet1 = &fec;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               i2c2 = &lpi2c3;
+               i2c3 = &lpi2c4;
+               i2c4 = &lpi2c5;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
                rtc0 = &pcf85063;
                rtc1 = &bbnsm_rtc;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
+               serial2 = &lpuart3;
+               serial3 = &lpuart4;
+               serial4 = &lpuart5;
+               serial5 = &lpuart6;
+               serial6 = &lpuart7;
+               serial7 = &lpuart8;
+               spi0 = &lpspi1;
+               spi1 = &lpspi2;
+               spi2 = &lpspi3;
+               spi3 = &lpspi4;
+               spi4 = &lpspi5;
+               spi5 = &lpspi6;
        };
 
        backlight_lvds: backlight {

diff --git a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts
index 219f49a4f87f0eed7db1256f56d9404d47966895..8a88c98ac05a7fb7538b12621e568866b1d41006 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts
@@ -28,8 +28,33 @@
                eeprom0 = &eeprom0;
                ethernet0 = &eqos;
                ethernet1 = &fec;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               i2c2 = &lpi2c3;
+               i2c3 = &lpi2c4;
+               i2c4 = &lpi2c5;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
                rtc0 = &pcf85063;
                rtc1 = &bbnsm_rtc;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
+               serial2 = &lpuart3;
+               serial3 = &lpuart4;
+               serial4 = &lpuart5;
+               serial5 = &lpuart6;
+               serial6 = &lpuart7;
+               serial7 = &lpuart8;
+               spi0 = &lpspi1;
+               spi1 = &lpspi2;
+               spi2 = &lpspi3;
+               spi3 = &lpspi4;
+               spi4 = &lpspi5;
+               spi5 = &lpspi6;
        };
 
        backlight_lvds: backlight {

diff --git a/arch/arm64/boot/dts/freescale/imx93-var-som-symphony.dts b/arch/arm64/boot/dts/freescale/imx93-var-som-symphony.dts
index 576d6982a4a0e50a387ce63c397ff30c47076f03..c789c1f24bdce929ccf6bb19d92ef260b22a346f 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93-var-som-symphony.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-var-som-symphony.dts
@@ -17,8 +17,25 @@
        aliases {
                ethernet0 = &eqos;
                ethernet1 = &fec;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               i2c0 = &lpi2c1;
+               i2c1 = &lpi2c2;
+               i2c2 = &lpi2c3;
+               i2c3 = &lpi2c4;
+               i2c4 = &lpi2c5;
+               mmc0 = &usdhc1;
+               mmc1 = &usdhc2;
+               serial0 = &lpuart1;
+               serial1 = &lpuart2;
+               serial2 = &lpuart3;
+               serial3 = &lpuart4;
+               serial4 = &lpuart5;
+               serial5 = &lpuart6;
        };
 
+
        chosen {
                stdout-path = &lpuart1;
        };

diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi
index 8a7f1cd76c766ab558acf5176022a4c42e648548..d505f9dfd8ee8ee01053d9b74afe6d3b45bb0a7c 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx93.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx93.dtsi
@@ -18,40 +18,6 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
-       aliases {
-               gpio0 = &gpio1;
-               gpio1 = &gpio2;
-               gpio2 = &gpio3;
-               gpio3 = &gpio4;
-               i2c0 = &lpi2c1;
-               i2c1 = &lpi2c2;
-               i2c2 = &lpi2c3;
-               i2c3 = &lpi2c4;
-               i2c4 = &lpi2c5;
-               i2c5 = &lpi2c6;
-               i2c6 = &lpi2c7;
-               i2c7 = &lpi2c8;
-               mmc0 = &usdhc1;
-               mmc1 = &usdhc2;
-               mmc2 = &usdhc3;
-               serial0 = &lpuart1;
-               serial1 = &lpuart2;
-               serial2 = &lpuart3;
-               serial3 = &lpuart4;
-               serial4 = &lpuart5;
-               serial5 = &lpuart6;
-               serial6 = &lpuart7;
-               serial7 = &lpuart8;
-               spi0 = &lpspi1;
-               spi1 = &lpspi2;
-               spi2 = &lpspi3;
-               spi3 = &lpspi4;
-               spi4 = &lpspi5;
-               spi5 = &lpspi6;
-               spi6 = &lpspi7;
-               spi7 = &lpspi8;
-       };
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;