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 7d1836e8be786d496a9e45881c8df033daafa66f..726505821f027b113c560cc9b092d53b4a9d0031 100644 (file)
--- a/arch/arm/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/dts/socfpga_arria5_socdk.dts
@@ -21,10 +21,11 @@
        };
 
        aliases {
-               /* this allow the ethaddr uboot environmnet variable contents
+               /* this allow the ethaddr uboot environment variable contents
                 * to be added to the gmac1 device tree blob.
                 */
                ethernet0 = &gmac1;
+               udc0 = &usb1;
        };
 
        regulator_3_3v: 3-3-v-regulator {
@@ -81,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";