arm: dts: Refactor device trees using "&{/aliases}" syntax

Use the common syntax to define aliases.

Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> # Verdin iMX8M Plus
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

diff --git a/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
index 31f3a48..0eea4d1 100644 (file)
--- a/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
@@ -5,13 +5,17 @@
 
 #include "imx6qdl-u-boot.dtsi"
 
-&{/aliases} {
-       /* U-Boot won't find PMIC otherwise */
-       i2c0 = &i2c3;
-       i2c1 = &i2c2;
-       /* SDHCI instance order: eMMC, 4-bit SD/MMC (U-Boot won't find ConfigBlock otherwise) */
-       mmc0 = &usdhc3;
-       mmc1 = &usdhc1;
+/ {
+       aliases {
+               /* U-Boot won't find PMIC otherwise */
+               i2c0 = &i2c3;
+               i2c1 = &i2c2;
+               /* SDHCI instance order: eMMC, 4-bit SD/MMC
+                * (U-Boot won't find ConfigBlock otherwise)
+                */
+               mmc0 = &usdhc3;
+               mmc1 = &usdhc1;
+       };
 };
 
 &wdog1 {

diff --git a/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi b/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
index 3d19796..3c6e503 100644 (file)
--- a/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
@@ -5,18 +5,20 @@
 
 #include "imx6qdl-u-boot.dtsi"
 
-&{/aliases} {
-       /* U-Boot won't find PMIC otherwise */
-       i2c0 = &i2c1;
-       i2c1 = &i2c2;
-       i2c2 = &i2c3;
-       /*
-        * SDHCI instance order: eMMC, 8-bit SD/MMC, 4-bit SD
-        * (U-Boot won't find ConfigBlock otherwise)
-        */
-       mmc0 = &usdhc3;
-       mmc1 = &usdhc1;
-       mmc2 = &usdhc2;
+/ {
+       aliases {
+               /* U-Boot won't find PMIC otherwise */
+               i2c0 = &i2c1;
+               i2c1 = &i2c2;
+               i2c2 = &i2c3;
+               /*
+                * SDHCI instance order: eMMC, 8-bit SD/MMC, 4-bit SD
+                * (U-Boot won't find ConfigBlock otherwise)
+                */
+               mmc0 = &usdhc3;
+               mmc1 = &usdhc1;
+               mmc2 = &usdhc2;
+       };
 };
 
 &wdog1 {

diff --git a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
index 57ca28e..b2c12a4 100644 (file)
--- a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
@@ -5,10 +5,12 @@
 
 #include "imx7s-u-boot.dtsi"
 
-&{/aliases} {
-       /* SDHCI instance order: eMMC, SD/MMC */
-       mmc0 = &usdhc3;
-       mmc1 = &usdhc1;
+/ {
+       aliases {
+               /* SDHCI instance order: eMMC, SD/MMC */
+               mmc0 = &usdhc3;
+               mmc1 = &usdhc1;
+       };
 };
 
 &lcdif {

diff --git a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
index 8efa4dd..515f195 100644 (file)
--- a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
@@ -6,6 +6,12 @@
 #include "imx8mm-u-boot.dtsi"
 
 / {
+       aliases {
+               eeprom0 = &eeprom_module;
+               eeprom1 = &eeprom_carrier_board;
+               eeprom2 = &eeprom_display_adapter;
+       };
+
        wdt-reboot {
                compatible = "wdt-reboot";
                bootph-pre-ram;
@@ -13,12 +19,6 @@
        };
 };
 
-&{/aliases} {
-       eeprom0 = &eeprom_module;
-       eeprom1 = &eeprom_carrier_board;
-       eeprom2 = &eeprom_display_adapter;
-};
-
 &{/soc@0/bus@30800000/i2c@30a20000/pmic@25} {
        bootph-pre-ram;
 };

diff --git a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
index 2a1aa19..67f1d45 100644 (file)
--- a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
@@ -6,6 +6,12 @@
 #include "imx8mp-u-boot.dtsi"
 
 / {
+       aliases {
+               eeprom0 = &eeprom_module;
+               eeprom1 = &eeprom_carrier_board;
+               eeprom2 = &eeprom_display_adapter;
+       };
+
        wdt-reboot {
                compatible = "wdt-reboot";
                bootph-pre-ram;
@@ -13,12 +19,6 @@
        };
 };
 
-&{/aliases} {
-       eeprom0 = &eeprom_module;
-       eeprom1 = &eeprom_carrier_board;
-       eeprom2 = &eeprom_display_adapter;
-};
-
 &clk {
        bootph-all;
        bootph-pre-ram;