[openwrt/openwrt] ipq806x: move stdout-path to DTSI files
LEDE Commits
lede-commits at lists.infradead.org
Mon Jul 6 11:09:22 EDT 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/74e339f118e600f2169965989ec3618a39e69759
commit 74e339f118e600f2169965989ec3618a39e69759
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Fri Jul 3 15:35:03 2020 +0200
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 <freifunk at adrianschmutzler.de>
---
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 4 ----
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 4 ----
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 4 ----
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 1 -
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts | 4 ----
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 1 -
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 1 -
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 1 -
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 6 ++++++
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 6 ++++++
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 4 ----
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 4 ----
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 4 ----
.../files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 1 -
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 1 -
.../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 4 ----
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi | 4 ++++
17 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index 1db75a062a..005087dc8a 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/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 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
index e8de2c3519..1a259e1e9b 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ b/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 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index 31354a2f0f..2b4c6c961c 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/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>;
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 723c75b503..e1d35d7c65 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/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 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
index 2e50cca56a..e29084d8a9 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
+++ b/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 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 0242b5e767..2bc356c7ac 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/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 */
};
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 45cd6e0477..e8833247db 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/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 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index dfd71bb4e7..3381bc9477 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/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 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
index cd8f4635cb..07b8143f1a 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+++ b/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";
};
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
index 467c43590b..f36ca33818 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
+++ b/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";
};
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index 48d3041480..2c3aa2b8b8 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/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>;
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index 07909831ed..383fe762ca 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/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>;
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index 29928312e5..07201adf6d 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/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";
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index 6571aa4b92..297a8c5306 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/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 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 6c21ae5e24..a1966578ee 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/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";
};
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index 611015f191..7e30db26d8 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/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>;
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
index a95f4a12e0..7610ce8889 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
+++ b/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>;
More information about the lede-commits
mailing list