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

[u-boot] / arch / arm / dts / socfpga_arria5_socdk.dts

diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts
index 1b8689787280a6cc9deb7f93b1e3625e6baf4e50..726505821f027b113c560cc9b092d53b4a9d0031 100644 (file)
--- a/arch/arm/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/dts/socfpga_arria5_socdk.dts
@@ -21,14 +21,11 @@
        };
 
        aliases {
-               /* this allow the ethaddr uboot environmnet variable contents
-               * to be added to the gmac1 device tree blob.
-               */
+               /* this allow the ethaddr uboot environment variable contents
+                * to be added to the gmac1 device tree blob.
+                */
                ethernet0 = &gmac1;
-
-               spi0 = "/spi@ff705000";         /* QSPI */
-               spi1 = "/spi@fff00000";
-               spi2 = "/spi@fff01000";
+               udc0 = &usb1;
        };
 
        regulator_3_3v: 3-3-v-regulator {
@@ -37,6 +34,10 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
+
+       soc {
+               u-boot,dm-pre-reloc;
+       };
 };
 
 &gmac1 {
@@ -71,6 +72,8 @@
 &mmc0 {
        vmmc-supply = <&regulator_3_3v>;
        vqmmc-supply = <&regulator_3_3v>;
+       bus-width = <4>;
+       u-boot,dm-pre-reloc;
 };
 
 &usb1 {
@@ -79,8 +82,10 @@
 
 &qspi {
        status = "okay";
+       u-boot,dm-pre-reloc;
 
        flash0: n25q00@0 {
+               u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "n25q00";