ソースを参照

ipq806x: move stdout-path to DTSI files

All device DTS files in the target set the stdout-path 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).

Signed-off-by: Adrian Schmutzler <[email protected]>
Adrian Schmutzler 5 年 前
コミット
74e339f118

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

@@ -23,10 +23,6 @@
 		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
 };
 
 &adm_dma {

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

@@ -23,10 +23,6 @@
 		serial0 = &gsbi4_serial;
 		mdio-gpio0 = &mdio0;
 	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
 };
 
 &qcom_pinmux {

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

@@ -32,10 +32,6 @@
 		label-mac-device = &gmac2;
 	};
 
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 		pinctrl-0 = <&button_pins>;

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

@@ -33,7 +33,6 @@
 
 	chosen {
 		bootargs = "rootfstype=squashfs noinitrd";
-		stdout-path = "serial0:115200n8";
 	};
 
 	keys {

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

@@ -18,10 +18,6 @@
 		serial0 = &uart2;
 		mdio-gpio0 = &mdio0;
 	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
 };
 
 &qcom_pinmux {

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

@@ -33,7 +33,6 @@
 
 	chosen {
 		bootargs = "console=ttyMSM0,115200n8";
-		stdout-path = "serial0:115200n8";
 		append-rootblock = "ubi.mtd=";  /* append to bootargs adding the root deviceblock nbr from bootloader */
 	};
 

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

@@ -34,7 +34,6 @@
 
 	chosen {
 		bootargs = "rootfstype=squashfs noinitrd";
-		stdout-path = "serial0:115200n8";
 	};
 
 	keys {

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

@@ -38,7 +38,6 @@
 
 	chosen {
 		bootargs = "rootfstype=squashfs noinitrd";
-		stdout-path = "serial0:115200n8";
 	};
 
 	keys {

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

@@ -1,5 +1,11 @@
 #include "qcom-ipq8064.dtsi"
 
+/ {
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
+
 &CPU_SPC {
 	status = "okay";
 };

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

@@ -1,5 +1,11 @@
 #include "qcom-ipq8064.dtsi"
 
+/ {
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
+
 &CPU_SPC {
 	status = "okay";
 };

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

@@ -31,10 +31,6 @@
 		led-upgrade = &general;
 	};
 
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 		pinctrl-0 = <&button_pins>;

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

@@ -31,10 +31,6 @@
 		led-upgrade = &power_green;
 	};
 
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 		pinctrl-0 = <&button_pins>;

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

@@ -52,10 +52,6 @@
 		led-upgrade = &led_pass;
 	};
 
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

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

@@ -34,7 +34,6 @@
 	chosen {
 		/* use "ubi_rootfs" volume in "ubi" partition as rootfs */
 		bootargs = "ubi.block=0,1 root=/dev/ubiblock0_1 rootfstype=squashfs";
-		stdout-path = "serial0:115200n8";
 	};
 
 	leds {

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

@@ -34,7 +34,6 @@
 
 	chosen {
 		bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd";
-		stdout-path = "serial0:115200n8";
 		append-rootblock = "root=/dev/mmcblk0p";
 	};
 

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

@@ -37,10 +37,6 @@
 		label-mac-device = &gmac2;
 	};
 
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 		pinctrl-0 = <&button_pins>;

+ 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";
 
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
 	cpus {
 		qcom,l2 {
 			qcom,l2-cpufreq = <384000000 600000000 1400000000>;