ipq806x: move serial0 to DTSI files
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Fri, 3 Jul 2020 13:46:31 +0000 (15:46 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Mon, 6 Jul 2020 14:24:30 +0000 (16:24 +0200)
All device DTS files in the target set the serial0 property to the
same value (*). So, let's move the definitions to the DTSI files.

That's also where the kernel defines it (qcom-ipq8064-v1.0.dtsi).

* The only exception is ipq8064-db149, which defines
  "serial0 = &uart2;", but inside a block called "alias" instead of
  "aliases". It must be assumed that this is broken anyway, so we
  don't touch it here.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
16 files changed:
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi

index 005087dc8a2bf88d3585d244b72bd2157160f14a..6c3410bf355bfb3503ed0caa887308b5a3778204 100644 (file)
@@ -20,7 +20,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
        };
 };
index 1a259e1e9b38d228a14d13b0e7420ebe6e86e2b6..41a2bf116e6fe28823376b8b03bb631882e7a8b3 100644 (file)
@@ -20,7 +20,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
        };
 };
index 2b4c6c961c617162452b697b5bcf201646071fd4..c6d7da39174309d47cf22e92c00112213567a17b 100644 (file)
@@ -22,7 +22,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power;
index e1d35d7c653e07b68b0b11d38712ff9858df6e54..5bd195955ab95eca9c3ff067a8e92c3d4102c8ac 100644 (file)
@@ -22,7 +22,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power_white;
index 2bc356c7ac8cfaa5b28caf6a3d543f7b67f74949..0e4563a96140bc13e52726281a014edeb27de415 100644 (file)
@@ -22,7 +22,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power;
index e8833247dba1224c3d077668d6626b0f668558e8..49b34a32c6287218e1a1134c18c1e8147e1d866a 100644 (file)
@@ -23,7 +23,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power_white;
index 3381bc9477fef7e0f04270a128c1073192a61d46..015de3d2b1d542fdcdf6a854c6cac6ad8ccd45cc 100644 (file)
@@ -27,7 +27,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power;
index 07b8143f1a03db3f2cda4228477291614f65935c..40cae75746a2f6078ea453d3b4c4e714132ccf5a 100644 (file)
@@ -1,6 +1,10 @@
 #include "qcom-ipq8064.dtsi"
 
 / {
+       aliases {
+               serial0 = &gsbi4_serial;
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };
index f36ca338184eda9ccbd3475a75dca4e3458e7999..3a2bb6aebcd05732494d29ab4148383d5cf94ab9 100644 (file)
@@ -1,6 +1,10 @@
 #include "qcom-ipq8064.dtsi"
 
 / {
+       aliases {
+               serial0 = &gsbi4_serial;
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };
index 2c3aa2b8b8286b4ff065911f4181906fee6d45e3..5de089eab42e8057cd7ed7a32e4de934712ccf23 100644 (file)
@@ -22,7 +22,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power;
index 383fe762ca809118bf18877b8d3584c125f73c3d..f8a0d07016b34a7b14b886a6add9fbb29c652bb9 100644 (file)
@@ -22,7 +22,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power_green;
index 07201adf6d14d9567433dcfbbbefa9d2a58d01e4..6dc1f92751bdea8e5013c376ee781ac58e325511 100644 (file)
@@ -42,7 +42,6 @@
 
        aliases {
                mdio-gpio0 = &mdio0;
-               serial0 = &gsbi4_serial;
                ethernet0 = &gmac1;
                ethernet1 = &gmac0;
 
index 297a8c530644578053f6af213a23dac51d21242a..557ea614523d6978bd67026e44e17f6d490944d1 100644 (file)
@@ -23,8 +23,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
-
                led-boot = &power;
                led-failsafe = &diag;
                led-running = &power;
index a1966578ee93828dc3b36aff21ce0dc4afe4c8a1..02cb4dc7e89f7fec87c606c32dae2ca6f10013a4 100644 (file)
@@ -22,7 +22,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
                sdcc1 = &sdcc1;
 
index 7e30db26d86b3df881c456beb375dd6282dcbfbe..f7cc8643f152eaf3f8718febb2b778960adab11e 100644 (file)
@@ -27,7 +27,6 @@
        };
 
        aliases {
-               serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
 
                led-boot = &power_white;
index 7610ce8889e8e7db5c77eb8d8cd0e4295efb8e90..a478c3c764beb6b47e97f1907e32696ba9686719 100644 (file)
@@ -4,6 +4,10 @@
        model = "Qualcomm IPQ8065";
        compatible = "qcom,ipq8065", "qcom,ipq8064";
 
+       aliases {
+               serial0 = &gsbi4_serial;
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };