Jelajahi Sumber

ipq806x: move serial0 to DTSI files

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 <[email protected]>
Adrian Schmutzler 5 tahun lalu
induk
melakukan
883250014d

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts

@@ -20,7 +20,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 	};
 };

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts

@@ -20,7 +20,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 	};
 };

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts

@@ -22,7 +22,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power;

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts

@@ -22,7 +22,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power_white;

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts

@@ -22,7 +22,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power;

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts

@@ -23,7 +23,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power_white;

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts

@@ -27,7 +27,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power;

+ 4 - 0
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi

@@ -1,6 +1,10 @@
 #include "qcom-ipq8064.dtsi"
 
 / {
+	aliases {
+		serial0 = &gsbi4_serial;
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};

+ 4 - 0
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi

@@ -1,6 +1,10 @@
 #include "qcom-ipq8064.dtsi"
 
 / {
+	aliases {
+		serial0 = &gsbi4_serial;
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts

@@ -22,7 +22,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power;

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts

@@ -22,7 +22,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power_green;

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts

@@ -42,7 +42,6 @@
 
 	aliases {
 		mdio-gpio0 = &mdio0;
-		serial0 = &gsbi4_serial;
 		ethernet0 = &gmac1;
 		ethernet1 = &gmac0;
 

+ 0 - 2
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts

@@ -23,8 +23,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
-
 		led-boot = &power;
 		led-failsafe = &diag;
 		led-running = &power;

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts

@@ -22,7 +22,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 		sdcc1 = &sdcc1;
 

+ 0 - 1
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts

@@ -27,7 +27,6 @@
 	};
 
 	aliases {
-		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 
 		led-boot = &power_white;

+ 4 - 0
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi

@@ -4,6 +4,10 @@
 	model = "Qualcomm IPQ8065";
 	compatible = "qcom,ipq8065", "qcom,ipq8064";
 
+	aliases {
+		serial0 = &gsbi4_serial;
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};