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

[u-boot] / arch / arm / dts / uniphier-ph1-pro4-ref.dts

diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
index ec1117d4a248fe0940228a4e8ff5b961964e2c3e..5be76e2d66e84025548736aa4fce314b6ae17d0a 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
@@ -9,6 +9,7 @@
 /dts-v1/;
 /include/ "uniphier-ph1-pro4.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
+/include/ "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier PH1-Pro4 Reference Board";
@@ -20,8 +21,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS0,115200";
-               stdout-path = &serial0;
+               stdout-path = "serial0:115200n8";
        };
 
        aliases {
@@ -39,6 +39,10 @@
        };
 };
 
+&ethsc {
+       interrupts = <0 50 4>;
+};
+
 &serial0 {
        status = "okay";
 };
@@ -55,6 +59,14 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
+&sd1 {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
@@ -67,7 +79,21 @@
        status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
+/ {
+       soc {
+               u-boot,dm-pre-reloc;
+       };
+};
+
 &serial0 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart0 {
+       u-boot,dm-pre-reloc;
 };