From 986c00037264f0cf3eaf1ebf66df3af035a21b3b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 18 Jul 2020 10:43:12 +0800 Subject: [PATCH] Revert "ipq806x: fix aliases node name for Qualcomm IPQ8064/DB149" This reverts commit 037de3e579c98d0ba66977ddeb6cd9ca31408e05. Revert "ipq806x: use consistent DT labels for gsbiX_serial" This reverts commit 9b305d84566b2de4268dfaac108b8d5eb0898588. Revert "ipq806x: really fix aliases node for Qualcomm IPQ8064/DB149" This reverts commit 099c14802e2a4f53fd5fc33bfbbc2d1c6fadf453. --- .../arch/arm/boot/dts/qcom-ipq8064-db149.dts | 11 ++++++----- .../files-4.14/arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- .../arch/arm/boot/dts/qcom-ipq8064-db149.dts | 12 ++++++------ .../files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts index 61aff0f855..f4cface193 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -4,10 +4,6 @@ model = "Qualcomm IPQ8064/DB149"; compatible = "qcom,ipq8064-db149", "qcom,ipq8064"; - aliases { - serial0 = &gsbi2_serial; - }; - reserved-memory { #address-cells = <1>; #size-cells = <1>; @@ -18,6 +14,11 @@ }; }; + alias { + serial0 = &uart2; + mdio-gpio0 = &mdio0; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -60,7 +61,7 @@ gsbi2: gsbi@12480000 { qcom,mode = ; status = "ok"; - gsbi2_serial: serial@12490000 { + uart2: serial@12490000 { status = "ok"; }; }; diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064.dtsi index a8242a0267..d850553000 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -734,7 +734,7 @@ syscon-tcsr = <&tcsr>; - gsbi2_serial: serial@12490000 { + uart2: serial@12490000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x12490000 0x1000>, <0x12480000 0x1000>; @@ -809,7 +809,7 @@ syscon-tcsr = <&tcsr>; - gsbi5_serial: serial@1a240000 { + uart5: serial@1a240000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x1a240000 0x1000>, <0x1a200000 0x1000>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts index 35b7e0ea37..5da523a728 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -4,10 +4,6 @@ model = "Qualcomm IPQ8064/DB149"; compatible = "qcom,ipq8064-db149", "qcom,ipq8064"; - aliases { - serial0 = &gsbi2_serial; - }; - reserved-memory { #address-cells = <1>; #size-cells = <1>; @@ -18,6 +14,11 @@ }; }; + alias { + serial0 = &uart2; + mdio-gpio0 = &mdio0; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -60,8 +61,7 @@ gsbi2: gsbi@12480000 { qcom,mode = ; status = "okay"; - - gsbi2_serial: serial@12490000 { + uart2: serial@12490000 { status = "okay"; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index a542af7866..f95b0b4f95 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -818,7 +818,7 @@ syscon-tcsr = <&tcsr>; - gsbi2_serial: serial@12490000 { + uart2: serial@12490000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x12490000 0x1000>, <0x12480000 0x1000>; @@ -893,7 +893,7 @@ syscon-tcsr = <&tcsr>; - gsbi5_serial: serial@1a240000 { + uart5: serial@1a240000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x1a240000 0x1000>, <0x1a200000 0x1000>;