Merge branch 'master' into next

[platform/kernel/u-boot.git] / arch / m68k / dts / stmark2.dts

diff --git a/arch/m68k/dts/stmark2.dts b/arch/m68k/dts/stmark2.dts
index 56c328f..ebe8580 100644 (file)
--- a/arch/m68k/dts/stmark2.dts
+++ b/arch/m68k/dts/stmark2.dts
@@ -27,7 +27,7 @@
        flash: is25lp128@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <60000000>;
                reg = <1>;
        };