From 883250014daad1f1cc802ca1c23bb8f0eded9489 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 3 Jul 2020 15:46:31 +0200 Subject: [PATCH] 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 --- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 4 ++++ .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 4 ++++ .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 2 -- .../files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 1 - .../files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 1 - .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi | 4 ++++ 16 files changed, 12 insertions(+), 14 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 005087dc8a..6c3410bf35 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 @@ -20,7 +20,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; }; }; 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 1a259e1e9b..41a2bf116e 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 @@ -20,7 +20,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; }; }; 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 2b4c6c961c..c6d7da3917 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 @@ -22,7 +22,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power; 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 e1d35d7c65..5bd195955a 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 @@ -22,7 +22,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power_white; 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 2bc356c7ac..0e4563a961 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 @@ -22,7 +22,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power; 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 e8833247db..49b34a32c6 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 @@ -23,7 +23,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power_white; 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 3381bc9477..015de3d2b1 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 @@ -27,7 +27,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power; 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 07b8143f1a..40cae75746 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,6 +1,10 @@ #include "qcom-ipq8064.dtsi" / { + aliases { + serial0 = &gsbi4_serial; + }; + chosen { stdout-path = "serial0:115200n8"; }; 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 f36ca33818..3a2bb6aebc 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,6 +1,10 @@ #include "qcom-ipq8064.dtsi" / { + aliases { + serial0 = &gsbi4_serial; + }; + chosen { stdout-path = "serial0:115200n8"; }; 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 2c3aa2b8b8..5de089eab4 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 @@ -22,7 +22,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power; 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 383fe762ca..f8a0d07016 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 @@ -22,7 +22,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power_green; 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 07201adf6d..6dc1f92751 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 @@ -42,7 +42,6 @@ aliases { mdio-gpio0 = &mdio0; - serial0 = &gsbi4_serial; ethernet0 = &gmac1; ethernet1 = &gmac0; 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 297a8c5306..557ea61452 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 @@ -23,8 +23,6 @@ }; aliases { - serial0 = &gsbi4_serial; - led-boot = &power; led-failsafe = &diag; led-running = &power; 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 a1966578ee..02cb4dc7e8 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 @@ -22,7 +22,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; sdcc1 = &sdcc1; 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 7e30db26d8..f7cc8643f1 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 @@ -27,7 +27,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; led-boot = &power_white; 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 7610ce8889..a478c3c764 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"; + aliases { + serial0 = &gsbi4_serial; + }; + chosen { stdout-path = "serial0:115200n8"; };