Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / kirkwood-rd88f6192.dts

diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index 35a29dee8dd864f818c5cacd437a936eb2de0024..e0b959396ca2bfe4e6e624ef1ff83f1dbb6952fa 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -61,7 +61,7 @@
                        m25p128@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "st,m25p128";
+                               compatible = "st,m25p128", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <20000000>;
                                mode = <0>;