fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ipq806x: fix aliases node name for Qualcomm IPQ8064/DB149"

Browse Source 
This reverts commit 037de3e579.

Revert "ipq806x: use consistent DT labels for gsbiX_serial"

This reverts commit 9b305d8456.

Revert "ipq806x: really fix aliases node for Qualcomm IPQ8064/DB149"

This reverts commit 099c14802e.
This commit is contained in:
CN_SZTL 2020-07-18 10:43:12 +08:00
parent 6e4242eff9
commit 986c000372
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts
View File

@ -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 = <GSBI_PROT_I2C_UART>;
status = "ok";
gsbi2_serial: serial@12490000 {
uart2: serial@12490000 {
status = "ok";
};
};

4
target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064.dtsi
View File

@ -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>;

12
target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts
View File

@ -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 = <GSBI_PROT_I2C_UART>;
status = "okay";
gsbi2_serial: serial@12490000 {
uart2: serial@12490000 {
status = "okay";
};
};

4
target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi
View File

@ -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>;