Merge remote-tracking branch 'net-next/master' into mac80211-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / armada-385-db-ap.dts

diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index 7219ac3a3d900743114fd7d9001748118695515e..89f5a95954ed9020c070491cae36cc7b2556eccf 100644 (file)
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -70,7 +70,7 @@
                                spi-flash@0 {
                                        #address-cells = <1>;
                                        #size-cells = <1>;
-                                       compatible = "st,m25p128";
+                                       compatible = "st,m25p128", "jedec,spi-nor";
                                        reg = <0>; /* Chip select 0 */
                                        spi-max-frequency = <54000000>;
                                };