Merge tag 'socfpga_nand_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-ipq4019-ap.dk01.1.dtsi

diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
index e413b21ee3319be02927dca42aeef0c837698d00..418f9a0223363b8053fac02be4e1b4f5bda8be33 100644 (file)
--- 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";
@@ -61,7 +69,7 @@
                        status = "ok";
                };
 
-               spi_0: spi@78b5000 {
+               spi@78b5000 {
                        pinctrl-0 = <&spi_0_pins>;
                        pinctrl-names = "default";
                        status = "ok";