From c83f7b6d217fdb116412d446b81d122b4a432874 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 3 Jul 2020 15:50:42 +0200 Subject: [PATCH] ipq806x: fix aliases node name for Qualcomm IPQ8064/DB149 This device uses a node incorrectly named "alias" instead of "aliases" since it was introduced. Remove it without replacement, as the definitions in it don't seem to be required anyway: The serial0 definition has never been effective anyway and this would be the only device deviating from the common setting "serial0 = &gsbi4_serial;" for ipq8064. (So, maybe the wrong node prevented us from finding out about the wrong serial definition?) The mdio-gpio0 alias was supposed to be removed in d2a2eb7e48f6 anyway, the redundant definition in the alias node was just overlooked back then. Fixes: 0fd202f3e563 ("ipq806x: add db149 dts files") Fixes: d2a2eb7e48f6 ("ipq806x: replace caf nss-gmac driver by upstream stmmac") Signed-off-by: Adrian Schmutzler --- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts | 5 ----- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) 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 5da523a728..625e9a84ff 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 @@ -14,11 +14,6 @@ }; }; - alias { - serial0 = &uart2; - mdio-gpio0 = &mdio0; - }; - chosen { stdout-path = "serial0:115200n8"; }; 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 e29084d8a9..e97c16b7e0 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 @@ -13,11 +13,6 @@ no-map; }; }; - - alias { - serial0 = &uart2; - mdio-gpio0 = &mdio0; - }; }; &qcom_pinmux { @@ -180,4 +175,4 @@ phy-mode = "sgmii"; qcom,id = <3>; phy-handle = <&phy7>; -}; \ No newline at end of file +}; -- 2.30.2