spi: cadence_qspi: use "cdns,qspi-nor" as compatible

Linux uses "cdns,qspi-nor" as compatible string for the cadence
qspi driver, so change driver, docs and all device trees.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

diff --git a/arch/arm/dts/keystone-k2g.dtsi b/arch/arm/dts/keystone-k2g.dtsi
index 9bcfea6d86377f7dbaffa97f6000b2d05b97e530..bbbb9874c87b359a29d3e64ee1d4fba51435bdd0 100644 (file)
--- a/arch/arm/dts/keystone-k2g.dtsi
+++ b/arch/arm/dts/keystone-k2g.dtsi
@@ -85,7 +85,7 @@
                };
 
                qspi: qspi@2940000 {
-                       compatible =  "cadence,qspi";
+                       compatible =  "cdns,qspi-nor";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x02940000 0x1000>,

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 314449478d0ba5c48762b26f571c9b9d1e7dd861..9d8c4ebd15a82069f68953c85061d8df2d59e1c7 100644 (file)
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -646,7 +646,7 @@
                };
 
                qspi: spi@ff705000 {
-                       compatible = "cadence,qspi";
+                       compatible = "cdns,qspi-nor";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xff705000 0x1000>,

diff --git a/arch/arm/dts/socfpga_arria10.dtsi b/arch/arm/dts/socfpga_arria10.dtsi
index 46f2fd4b69b5d5db7cc67d6df049cd7979901a83..2c5249c1eb4ff93f5e7aa0899ee68a46d39bb462 100644 (file)
--- a/arch/arm/dts/socfpga_arria10.dtsi
+++ b/arch/arm/dts/socfpga_arria10.dtsi
@@ -748,7 +748,7 @@
                };
 
                qspi: spi@ff809000 {
-                       compatible = "cdns,qspi-nor", "cadence,qspi";
+                       compatible = "cdns,qspi-nor";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xff809000 0x100>,

diff --git a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts
index bceac09154259f1dd86c0c67be9291ca53fd28a2..98bd5dfc70f237942f2d8d1d7d5fccc58b2ea592 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>,

diff --git a/doc/device-tree-bindings/spi/spi-cadence.txt b/doc/device-tree-bindings/spi/spi-cadence.txt
index 74c82080fc935806a78a844a23c44e9a34e0fd75..69e02c1c4b1fccbaa7d4e3c0b65d88dfcdbed4d8 100644 (file)
--- a/doc/device-tree-bindings/spi/spi-cadence.txt
+++ b/doc/device-tree-bindings/spi/spi-cadence.txt
@@ -2,7 +2,7 @@ Cadence QSPI controller device tree bindings
 --------------------------------------------
 
 Required properties:
-- compatible           : should be "cadence,qspi".
+- compatible           : should be "cdns,qspi-nor"
 - reg                  : 1.Physical base address and size of SPI registers map.
                          2. Physical base address & size of NOR Flash.
 - clocks               : Clock phandles (see clock bindings for details).

diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 29db6fa36844b78971a7755e4334a7092268f34f..11fce9c4fe5c73d22b68b884195a6dbe3b1f016a 100644 (file)
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -329,7 +329,7 @@ static const struct dm_spi_ops cadence_spi_ops = {
 };
 
 static const struct udevice_id cadence_spi_ids[] = {
-       { .compatible = "cadence,qspi" },
+       { .compatible = "cdns,qspi-nor" },
        { }
 };