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

[oweals/u-boot.git] / arch / arm / dts / socfpga_arria5_socdk-u-boot.dtsi

diff --git a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
index c44d1ee2fa188b7262e70499865a7b5b4e2e63e7..dfaff4c0f7bb8e2a1e20de4ad6aa40b3f8022191 100644 (file)
--- a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
@@ -6,15 +6,13 @@
  * Copyright (c) 2018 Simon Goldschmidt
  */
 
+#include "socfpga-common-u-boot.dtsi"
+
 /{
        aliases {
                spi0 = "/soc/spi@ff705000";
                udc0 = &usb1;
        };
-
-       soc {
-               u-boot,dm-pre-reloc;
-       };
 };
 
 &watchdog0 {
@@ -30,7 +28,7 @@
 };
 
 &flash {
-       compatible = "n25q00", "spi-flash";
+       compatible = "n25q00", "jedec,spi-nor";
        u-boot,dm-pre-reloc;
 };