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

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

diff --git a/arch/arm/dts/uniphier-ph1-sld8-ref.dts b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
index 6269f9afd32a7c8282f13dc742386b7efe6e93f7..9af012cab79ea0c048ddb16cfb8915982c53e6d2 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
@@ -9,6 +9,7 @@
 /dts-v1/;
 /include/ "uniphier-ph1-sld8.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
+/include/ "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier PH1-sLD8 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 48 4>;
+};
+
 &serial0 {
        status = "okay";
 };
@@ -52,6 +56,10 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
@@ -64,7 +72,11 @@
        status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 &serial0 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart0 {
+       u-boot,dm-pre-reloc;
 };