Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / arm / dts / uniphier-proxstream2-vodka.dts

diff --git a/arch/arm/dts/uniphier-proxstream2-vodka.dts b/arch/arm/dts/uniphier-proxstream2-vodka.dts
index e7d5db8894218936de84330a8ab8fe82430da9e1..928a0928fd1b71d444ff307002aa7fa92f28575d 100644 (file)
--- a/arch/arm/dts/uniphier-proxstream2-vodka.dts
+++ b/arch/arm/dts/uniphier-proxstream2-vodka.dts
@@ -19,13 +19,13 @@
        };
 
        chosen {
-               stdout-path = "serial2:115200n8";
+               stdout-path = "serial0:115200n8";
        };
 
        aliases {
-               serial0 = &serial0;
-               serial1 = &serial1;
-               serial2 = &serial2;
+               serial0 = &serial2;
+               serial1 = &serial0;
+               serial2 = &serial1;
                i2c0 = &i2c0;
                i2c4 = &i2c4;
                i2c5 = &i2c5;
@@ -50,12 +50,6 @@
 };
 
 /* for U-Boot only */
-/ {
-       soc {
-               u-boot,dm-pre-reloc;
-       };
-};
-
 &serial2 {
        u-boot,dm-pre-reloc;
 };
@@ -68,10 +62,6 @@
        u-boot,dm-pre-reloc;
 };
 
-&pinctrl {
-       u-boot,dm-pre-reloc;
-};
-
 &pinctrl_uart2 {
        u-boot,dm-pre-reloc;
 };