ipq40xx: device-tree overhaul

 - replace licence texts with SPDX-License-Identifier where
   applicable.

 - make node-names more generic to fit with Device-Tree Release v0.2
   Section 2.2.2 Generic Names Recommendation.

 - utilize wifi0/1, blsp1_uart1 labels

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
index 4c1e1de24c3a4c47a6ea27cab88e21a23b9ad376..ed81cbc9b5ecdfae52ca34cd01db5595598d650e 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
@@ -63,12 +63,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -180,6 +174,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &cryptobam {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
index 0e49dadcf5b3e82c99c74ca818c693d8403d2824..a86e34229e62b07bf754af2779c04710e2e32143 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
@@ -36,12 +36,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -208,6 +202,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &cryptobam {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
index 905f22f8560d0d2ef650d35520919df04276b209..ceece0f95682cf9876995355164829764a14863e 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
@@ -51,12 +51,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -290,6 +284,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &blsp_dma {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
index 598e22c8153f1bc13a4fc11a4e623e104b8fe1c7..9576e14f25aab0c5c8476f10210503ece4a0b86a 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
@@ -1,18 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
 #include "qcom-ipq4019.dtsi"
 #include <dt-bindings/gpio/gpio.h>
@@ -67,12 +53,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                usb3@8af8800 {
                        status = "okay";
                };
@@ -81,16 +61,6 @@
                        status = "okay";
                };
 
-               wifi@a000000 {
-                       status = "okay";
-                       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-               };
-
-               wifi@a800000 {
-                       status = "okay";
-                       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-               };
-
                watchdog@b017000 {
                        status = "okay";
                };
@@ -114,7 +84,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wlan {
@@ -130,7 +100,7 @@
                };
        };
 
-       gpio-leds {
+       switch-leds {
                compatible = "gpio-leds";
 
                wlan {
@@ -207,7 +177,7 @@
        status = "okay";
        cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
 
-       mx25l25635f@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -290,6 +260,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &usb3_ss_phy {
        status = "okay";
 };
@@ -301,3 +277,13 @@
 &usb2_hs_phy {
        status = "okay";
 };
+
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
+};
+
+&wifi1 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
+};

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
index 78b38a1411803d6ebfad431cb18afa46ab729195..fd7c66c95320253f6a572caf44b0f04c06a69977 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
@@ -70,12 +70,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                usb3: usb3@8af8800 {
                        status = "okay";
                };
@@ -225,6 +219,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &cryptobam {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
index c74fce55fa5c98e83cb96ca8e3cdd6c32419ae69..08ae27d682d82fe359f960cdb0b54b042402c4b7 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
@@ -1,18 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
 #include "qcom-ipq4019.dtsi"
 #include <dt-bindings/gpio/gpio.h>
@@ -77,12 +63,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                usb3@8af8800 {
                        status = "okay";
                };
@@ -104,7 +84,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wlan {
@@ -127,7 +107,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-0 = <&led_pins>;
                pinctrl-names = "default";
@@ -291,6 +271,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &cryptobam {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
index 4d546bf40fbb7cc55ea3129806b52ab0a8d39071..6b90b596d9c6b0b0bdd622585d709f3f1512ef46 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
@@ -1,18 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
 #include "qcom-ipq4019.dtsi"
 #include <dt-bindings/gpio/gpio.h>
@@ -76,12 +62,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                usb3@8af8800 {
                        status = "okay";
                };
@@ -206,7 +186,7 @@
        cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
                   <&tlmm 59 GPIO_ACTIVE_HIGH>;
 
-       m25p80@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <0>;
                /*
@@ -268,19 +248,25 @@
                };
        };
 
-       mt29f@1 {
+       flash@1 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "spinand,mt29f";
                reg = <1>;
                spi-max-frequency = <24000000>;
 
+               /*
+                * U-boot looks for "spinand,mt29f" node,
+                * if we don't have it, it will spit out the following warning:
+                * "ipq: fdt fixup unable to find compatible node".
+                */
+
                partitions {
                        compatible = "fixed-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       partition0@0 {
+                       partition@0 {
                                label = "ubi";
                                reg = <0x00000000 0x08000000>;
                        };
@@ -288,6 +274,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &usb3_ss_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
index 3838f9252efb4336a43aee589a16576287ca5b82..2809a67693ba89d01b658d3e526e3c3922946ce7 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
@@ -62,12 +62,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -157,6 +151,10 @@
        };
 };
 
+&blsp_dma {
+       status = "okay";
+};
+
 &blsp1_spi1 {
        pinctrl-0 = <&spi_0_pins>;
        pinctrl-names = "default";
@@ -242,7 +240,9 @@
        };
 };
 
-&blsp_dma {
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
        status = "okay";
 };
 

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts
index 8092e95e4c32734ae7f429e345c2fa6f337ee052..24cfc30fdfeb576ea3c04374559cb41ee8805c3d 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts
@@ -63,12 +63,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -190,6 +184,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &cryptobam {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
index 542e9de38b9ddbe0de7aaa0dcbf4068589ba41a8..c7a3084d768488fe633871957e2b74c9051cf29c 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
@@ -64,12 +64,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                usb3: usb3@8af8800 {
                        status = "okay";
                };
@@ -229,6 +223,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &cryptobam {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index 39616ec2ac79bcd1d9a33a41e350baed8ac0db56..fdfe969245a2230db0f6a752e92b65b513df3f9d 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -74,12 +74,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                usb3@8af8800 {
                        status = "okay";
                };
@@ -217,6 +211,12 @@
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &tlmm {
        serial_pins: serial_pinmux {
                mux {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts
index a91634e62a6ea51a40dfbc8a1a990de4ae49bd69..5073fe9cb8d2e9273d6fbb2d5d38a42493ceb379 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree Source for Meraki MR33 (Stinkbug)
  *
@@ -69,12 +70,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_0_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                serial@78b0000 {
                        pinctrl-0 = <&serial_1_pins>;
                        pinctrl-names = "default";
@@ -108,7 +103,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {
@@ -118,7 +113,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_orange: power {
@@ -133,6 +128,12 @@
        status = "okay";
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &cryptobam {
        status = "okay";
 };
@@ -160,11 +161,11 @@
        pinctrl-names = "default";
        status = "okay";
 
-       lp5562@30 {
-               enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
+       led-controller@30 {
                compatible = "ti,lp5562";
-               clock-mode = /bits/8 <2>;
                reg = <0x30>;
+               clock-mode = /bits/8 <2>;
+               enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
 
                /* RGB led */
                status_red: chan0 {

diff --git a/target/linux/ipq40xx/patches-4.14/084-ARM-dts-ipq4019-Add-a-default-chosen-node.patch b/target/linux/ipq40xx/patches-4.14/084-ARM-dts-ipq4019-Add-a-default-chosen-node.patch
new file mode 100644 (file)
index 0000000..513e623
--- /dev/null
+++ b/target/linux/ipq40xx/patches-4.14/084-ARM-dts-ipq4019-Add-a-default-chosen-node.patch
@@ -0,0 +1,45 @@
+From c696a020193e7f96ead97b6b19a2bcd929b299d3 Mon Sep 17 00:00:00 2001
+From: Sricharan R <sricharan@codeaurora.org>
+Date: Fri, 25 May 2018 11:41:11 +0530
+Subject: [PATCH] ARM: dts: ipq4019: Add a default chosen node
+
+Add a 'chosen' node to select the serial console.
+This is needed when bootloaders do not pass the
+'console=' bootargs.
+
+Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Signed-off-by: Sricharan R <sricharan@codeaurora.org>
+Signed-off-by: Andy Gross <andy.gross@linaro.org>
+---
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 8 ++++++++
+ arch/arm/boot/dts/qcom-ipq4019.dtsi           | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
+@@ -20,6 +20,14 @@
+       model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";
+       compatible = "qcom,ipq4019";
+ 
++      aliases {
++              serial0 = &blsp1_uart1;
++      };
++
++      chosen {
++              stdout-path = "serial0:115200n8";
++      };
++
+       soc {
+               rng@22000 {
+                       status = "ok";
+--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -346,7 +346,7 @@
+                       regulator;
+               };
+ 
+-              serial@78af000 {
++              blsp1_uart1: serial@78af000 {
+                       compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
+                       reg = <0x78af000 0x200>;
+                       interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch b/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch
index 25652bb2c91b54390f2044361b982da2073a7986..349f67c6652455e20c40c98d12b0a80e5bf446f8 100644 (file)
--- a/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch
+++ b/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
-@@ -15,12 +15,39 @@
+@@ -15,6 +15,7 @@
   */
  
  #include "qcom-ipq4019.dtsi"
@@ -8,7 +8,8 @@
  
  / {
        model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";
-       compatible = "qcom,ipq4019";
+@@ -29,6 +30,32 @@
+       };
  
        soc {
 +              tcsr@194b000 {
@@ -40,7 +41,7 @@
                rng@22000 {
                        status = "ok";
                };
-@@ -66,14 +93,6 @@
+@@ -74,14 +101,6 @@
                        pinctrl-names = "default";
                        status = "ok";
                        cs-gpios = <&tlmm 54 0>;
@@ -55,7 +56,7 @@
                };
  
                serial@78af000 {
-@@ -102,6 +121,22 @@
+@@ -110,6 +129,22 @@
                        status = "ok";
                };