From f196ac4e1d684ce015e4f526fffa6f4a69366edd 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). 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-mtfi-m520.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 ++++ 17 files changed, 12 insertions(+), 15 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 76c261b51e..758fa4de45 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 78ac0564cc..3f8bed9355 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 96c2512e8b..8bd6d965e9 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 48ac656042..6bc9ea7161 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 7bfda8b10e..1ba78089ab 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-mtfi-m520.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-mtfi-m520.dts index 7ce4c83c33..e75d884141 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-mtfi-m520.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-mtfi-m520.dts @@ -24,7 +24,6 @@ }; aliases { - serial0 = &gsbi4_serial; mdio-gpio0 = &mdio0; sdcc1 = &sdcc1; }; 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 977a73d3e3..75cdb71db5 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 726b9fce8d..cda17f208a 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 cf7614f438..8492d92459 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 f51fe67b41..2dbb855ff9 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 66eba1dcd3..cae0d1a17a 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 d66be9ab82..53371a72bd 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"; };