[openwrt/openwrt] ipq806x: really fix aliases node for Qualcomm IPQ8064/DB149

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3635f7efc1deef2a17b69000dcd20ad044e73706

commit 3635f7efc1deef2a17b69000dcd20ad044e73706
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Tue Jul 14 16:59:44 2020 +0200

    ipq806x: really fix aliases node for Qualcomm IPQ8064/DB149
    
    Having looked at this again, it appears that only gsbi2_serial
    is actually enabled for this device, so the entry in the broken
    aliases node was correct.
    
    Therefore, this needs to set its own serial0 instead of inheriting
    "serial0 = &gsbi4_serial;" from DTSI. Do this with the correctly
    named aliases node now.
    
    Fixes: c83f7b6d217f ("ipq806x: fix aliases node name for Qualcomm
    IPQ8064/DB149")
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts    | 7 ++++++-
 .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts     | 7 ++++++-
 2 files changed, 12 insertions(+), 2 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 625e9a84ff..35b7e0ea37 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,6 +4,10 @@
 	model = "Qualcomm IPQ8064/DB149";
 	compatible = "qcom,ipq8064-db149", "qcom,ipq8064";
 
+	aliases {
+		serial0 = &gsbi2_serial;
+	};
+
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -56,7 +60,8 @@
 		gsbi2: gsbi at 12480000 {
 			qcom,mode = <GSBI_PROT_I2C_UART>;
 			status = "okay";
-			uart2: serial at 12490000 {
+
+			gsbi2_serial: serial at 12490000 {
 				status = "okay";
 			};
 		};
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 e97c16b7e0..1f68f826cb 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
@@ -4,6 +4,10 @@
 	model = "Qualcomm IPQ8064/DB149";
 	compatible = "qcom,ipq8064-db149", "qcom,ipq8064";
 
+	aliases {
+		serial0 = &gsbi2_serial;
+	};
+
 	reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -28,7 +32,8 @@
 &gsbi2 {
 	qcom,mode = <GSBI_PROT_I2C_UART>;
 	status = "okay";
-	uart2: serial at 12490000 {
+
+	gsbi2_serial: serial at 12490000 {
 		status = "okay";
 	};
 };