Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[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 fba7b742ca63f2cb2dc12c4b8fc341a0c06f7d10..e7d5db8894218936de84330a8ab8fe82430da9e1 100644 (file)
--- a/arch/arm/dts/uniphier-proxstream2-vodka.dts
+++ b/arch/arm/dts/uniphier-proxstream2-vodka.dts
@@ -19,8 +19,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS2,115200";
-               stdout-path = &serial2;
+               stdout-path = "serial2:115200n8";
        };
 
        aliases {
@@ -42,7 +41,15 @@
        status = "okay";
 };
 
-/* for U-boot only */
+&emmc {
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+};
+
+/* for U-Boot only */
 / {
        soc {
                u-boot,dm-pre-reloc;
@@ -53,6 +60,14 @@
        u-boot,dm-pre-reloc;
 };
 
+&mio {
+       u-boot,dm-pre-reloc;
+};
+
+&emmc {
+       u-boot,dm-pre-reloc;
+};
+
 &pinctrl {
        u-boot,dm-pre-reloc;
 };
@@ -60,3 +75,7 @@
 &pinctrl_uart2 {
        u-boot,dm-pre-reloc;
 };
+
+&pinctrl_emmc {
+       u-boot,dm-pre-reloc;
+};