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

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

diff --git a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts
index bceac09154259f1dd86c0c67be9291ca53fd28a2..b04e89971c77b9d9abc080609bdad882554f8bea 100644 (file)
--- a/arch/arm/dts/stv0991.dts
+++ b/arch/arm/dts/stv0991.dts
@@ -26,7 +26,7 @@
        };
 
        qspi: spi@80203000 {
-                       compatible = "cadence,qspi";
+                       compatible = "cdns,qspi-nor";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x80203000 0x100>,
@@ -40,7 +40,7 @@
                        flash0: n25q32@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spi-flash";
+                               compatible = "jedec,spi-nor";
                                reg = <0>;              /* chip select */
                                spi-max-frequency = <50000000>;
                                m25p,fast-read;