Merge git://git.denx.de/u-boot-marvell

diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-amc.dts
index 4649c910c7b0c55859b0c24d3275fcb15becadad..5e1588d57438e1a112c6424eff36ca26bb998fb4 100644 (file)
--- a/arch/arm/dts/armada-385-amc.dts
+++ b/arch/arm/dts/armada-385-amc.dts
@@ -154,7 +154,7 @@
                u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "st,m25p128", "jedec,spi-nor";
+               compatible = "st,m25p128", "jedec,spi-nor", "spi-flash";
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <50000000>;
                m25p,fast-read;