ramips: revert faulty 4.4 config change from 9c242270907
[oweals/openwrt.git] / target / linux / ipq806x / patches-4.4 / 020-add-ap148-bootargs.patch
1 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
2 +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
3 @@ -4,14 +4,6 @@
4         model = "Qualcomm IPQ8064/AP148";
5         compatible = "qcom,ipq8064-ap148", "qcom,ipq8064";
6  
7 -       aliases {
8 -               serial0 = &gsbi4_serial;
9 -       };
10 -
11 -       chosen {
12 -               stdout-path = "serial0:115200n8";
13 -       };
14 -
15         reserved-memory {
16                 #address-cells = <1>;
17                 #size-cells = <1>;
18 @@ -22,6 +14,14 @@
19                 };
20         };
21  
22 +       alias {
23 +               serial0 = &uart4;
24 +       };
25 +
26 +       chosen {
27 +               linux,stdout-path = "serial0:115200n8";
28 +       };
29 +
30         soc {
31                 pinmux@800000 {
32                         i2c4_pins: i2c4_pinmux {
33 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
34 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
35 @@ -159,7 +159,7 @@
36  
37                         syscon-tcsr = <&tcsr>;
38  
39 -                       serial@12490000 {
40 +                       uart2: serial@12490000 {
41                                 compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
42                                 reg = <0x12490000 0x1000>,
43                                       <0x12480000 0x1000>;
44 @@ -197,7 +197,7 @@
45  
46                         syscon-tcsr = <&tcsr>;
47  
48 -                       gsbi4_serial: serial@16340000 {
49 +                       uart4: serial@16340000 {
50                                 compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
51                                 reg = <0x16340000 0x1000>,
52                                       <0x16300000 0x1000>;
53 @@ -234,7 +234,7 @@
54  
55                         syscon-tcsr = <&tcsr>;
56  
57 -                       serial@1a240000 {
58 +                       uart5: serial@1a240000 {
59                                 compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
60                                 reg = <0x1a240000 0x1000>,
61                                       <0x1a200000 0x1000>;