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

[oweals/u-boot.git] / arch / arm / dts / uniphier-ph1-ld4-ref.dts

diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
index 9d697c1c88b4192a82ade2a7607d86eac40a105d..36de7e3a0f9680c1cec5b6abc52e8df69727080f 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@ -9,6 +9,7 @@
 /dts-v1/;
 /include/ "uniphier-ph1-ld4.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
+/include/ "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier PH1-LD4 Reference Board";
@@ -20,8 +21,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS0,115200";
-               stdout-path = &serial0;
+               stdout-path = "serial0:115200n8";
        };
 
        aliases {
@@ -36,6 +36,10 @@
        };
 };
 
+&ethsc {
+       interrupts = <0 49 4>;
+};
+
 &serial0 {
        status = "okay";
 };
@@ -52,29 +56,23 @@
        status = "okay";
 };
 
-&usb0 {
+&sd {
        status = "okay";
 };
 
-&usb1 {
+&usb0 {
        status = "okay";
 };
 
-/* for U-boot only */
-/ {
-       soc {
-               u-boot,dm-pre-reloc;
-       };
+&usb1 {
+       status = "okay";
 };
 
+/* for U-Boot only */
 &serial0 {
        u-boot,dm-pre-reloc;
 };
 
-&pinctrl {
-       u-boot,dm-pre-reloc;
-};
-
 &pinctrl_uart0 {
        u-boot,dm-pre-reloc;
 };