aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-07-14 16:59:44 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-07-14 17:02:40 +0200
commit3635f7efc1deef2a17b69000dcd20ad044e73706 (patch)
treed0f8b67a490021da4ba2fc5362efc7d4b72102f7
parente363470d1a7170d702ec2c8677ea340cd50a42fd (diff)
downloadupstream-3635f7efc1deef2a17b69000dcd20ad044e73706.tar.gz
upstream-3635f7efc1deef2a17b69000dcd20ad044e73706.tar.bz2
upstream-3635f7efc1deef2a17b69000dcd20ad044e73706.zip
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@adrianschmutzler.de>
-rw-r--r--target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts7
-rw-r--r--target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts7
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@12480000 {
qcom,mode = <GSBI_PROT_I2C_UART>;
status = "okay";
- uart2: serial@12490000 {
+
+ gsbi2_serial: serial@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@12490000 {
+
+ gsbi2_serial: serial@12490000 {
status = "okay";
};
};