spi: dw: Add SoC-specific compatible strings

This adds SoC-specific compatible strings to all users of the designware
spi device. This will allow for the correct driver to be selected for each
device. Where it is publicly documented, a compatible string for the
specific device version has also been added. Devices without
publicly-documented device versions include MSCC SoCs, and Arc Socs. All
compatible strings except those for SoCFPGAs and some of the versioned
strings have been taken from Linux.

Since SSI_MAX_XFER_SIZE is determined at runtime, this is not strictly
necessary. However, it is a good cleanup and brings things closer to Linux.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Tested-by Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi
index daf7ca68fb9ae26ac936fe4e39f593bd2efab232..d4ff4f703978fefab19a0244ed14b006f377c5ce 100644 (file)
--- a/arch/arc/dts/axs10x_mb.dtsi
+++ b/arch/arc/dts/axs10x_mb.dtsi
@@ -90,7 +90,7 @@
                };
 
                spi0: spi@0 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "snps,axs10x-spi", "snps,dw-apb-ssi";
                        reg = <0x0 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/arch/arc/dts/hsdk-common.dtsi b/arch/arc/dts/hsdk-common.dtsi
index a4b348b9484324d31d7b2f198a9aff967b2744f7..3fc82e57d73ba47a1c0769d1fecd79c12771eb03 100644 (file)
--- a/arch/arc/dts/hsdk-common.dtsi
+++ b/arch/arc/dts/hsdk-common.dtsi
@@ -128,7 +128,7 @@
        };
 
        spi0: spi@f0020000 {
-               compatible = "snps,dw-apb-ssi";
+               compatible = "snps,hsdk-spi", "snps,dw-apb-ssi";
                reg = <0xf0020000 0x1000>;
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index eda558f2fe736f468869e64a0d3ca6465d2c5148..ff79d335ac78452d48d1258643b4f2abb8ec5e35 100644 (file)
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -804,7 +804,8 @@
                };
 
                spi0: spi@fff00000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "altr,socfpga-spi", "snps,dw-apb-ssi-3.20",
+                                    "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xfff00000 0x1000>;
@@ -816,7 +817,8 @@
                };
 
                spi1: spi@fff01000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "altr,socfpga-spi", "snps,dw-apb-ssi-3.20",
+                                    "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xfff01000 0x1000>;

diff --git a/arch/arm/dts/socfpga_agilex.dtsi b/arch/arm/dts/socfpga_agilex.dtsi
index 179b4d55913b816f4c6f7a0dfed8dd24e29a85ad..c3ead2d72b9ed5db10f1693949b1469cf6468315 100644 (file)
--- a/arch/arm/dts/socfpga_agilex.dtsi
+++ b/arch/arm/dts/socfpga_agilex.dtsi
@@ -366,7 +366,8 @@
                };
 
                spi0: spi@ffda4000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "intel,agilex-spi",
+                                    "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xffda4000 0x1000>;
@@ -379,7 +380,8 @@
                };
 
                spi1: spi@ffda5000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "intel,agilex-spi",
+                                    "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xffda5000 0x1000>;

diff --git a/arch/arm/dts/socfpga_arria10.dtsi b/arch/arm/dts/socfpga_arria10.dtsi
index a598c7554266bf4c9063d78a0ebb16ecfbfa4de1..bab34ab56c134ce2c9e09021151bf2bbd77fb580 100644 (file)
--- a/arch/arm/dts/socfpga_arria10.dtsi
+++ b/arch/arm/dts/socfpga_arria10.dtsi
@@ -604,7 +604,8 @@
                };
 
                spi0: spi@ffda4000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "altr,socfpga-arria10-spi",
+                                    "snps,dw-apb-ssi-3.22a", "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xffda4000 0x100>;
@@ -617,7 +618,8 @@
                };
 
                spi1: spi@ffda5000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "altr,socfpga-arria10-spi",
+                                    "snps,dw-apb-ssi-3.22a", "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xffda5000 0x100>;

diff --git a/arch/arm/dts/socfpga_stratix10.dtsi b/arch/arm/dts/socfpga_stratix10.dtsi
index cb799bc5512997b2fc52217f9f87efb8087f4518..7a7777202cbe4b863cb68b8c1cbde667673b3a2f 100755 (executable)
--- a/arch/arm/dts/socfpga_stratix10.dtsi
+++ b/arch/arm/dts/socfpga_stratix10.dtsi
@@ -268,7 +268,8 @@
                 };
 
                spi0: spi@ffda4000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "intel,stratix10-spi",
+                                    "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xffda4000 0x1000>;
@@ -281,7 +282,8 @@
                };
 
                spi1: spi@ffda5000 {
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "intel,stratix10-spi",
+                                    "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xffda5000 0x1000>;

diff --git a/arch/mips/dts/mscc,jr2.dtsi b/arch/mips/dts/mscc,jr2.dtsi
index 7f5a96fecdc625b307beaed8470d26d404af3c86..c44e9a2b3ab0c8e5e524882315efc72be8d0f18a 100644 (file)
--- a/arch/mips/dts/mscc,jr2.dtsi
+++ b/arch/mips/dts/mscc,jr2.dtsi
@@ -94,7 +94,7 @@
                spi0: spi-master@101000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "mscc,jaguar2-spi", "snps,dw-apb-ssi";
                        reg = <0x101000 0x40>;
                        num-chipselect = <4>;
                        bus-num = <0>;

diff --git a/arch/mips/dts/mscc,ocelot.dtsi b/arch/mips/dts/mscc,ocelot.dtsi
index 9a187b6e5880a9975010d19cefc1c8a42a768449..aeb4bf8f4b335c0156a40e318aa63245b5fab029 100644 (file)
--- a/arch/mips/dts/mscc,ocelot.dtsi
+++ b/arch/mips/dts/mscc,ocelot.dtsi
@@ -100,7 +100,7 @@
                spi0: spi-master@101000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       compatible = "snps,dw-apb-ssi";
+                       compatible = "mscc,ocelot-spi", "snps,dw-apb-ssi";
                        reg = <0x101000 0x40>;
                        num-chipselect = <4>;
                        bus-num = <0>;

diff --git a/arch/riscv/dts/k210.dtsi b/arch/riscv/dts/k210.dtsi
index 81ef8ca4f71e1022bc426e759f295df193ee7382..fce98b0fc340cb5a4daa0cd1ac6ee832a6e6015c 100644 (file)
--- a/arch/riscv/dts/k210.dtsi
+++ b/arch/riscv/dts/k210.dtsi
@@ -284,7 +284,8 @@
                        };
 
                        spi2: spi@50240000 {
-                               compatible = "kendryte,k120-spislave",
+                               compatible = "canaan,kendryte-k210-spi",
+                                            "snps,dw-apb-ssi-4.01",
                                             "snps,dw-apb-ssi";
                                spi-slave;
                                reg = <0x50240000 0x100>;
@@ -557,7 +558,8 @@
                        spi0: spi@52000000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               compatible = "kendryte,k210-spi",
+                               compatible = "canaan,kendryte-k210-spi",
+                                            "snps,dw-apb-ssi-4.01",
                                             "snps,dw-apb-ssi";
                                reg = <0x52000000 0x100>;
                                interrupts = <1>;
@@ -573,7 +575,8 @@
                        spi1: spi@53000000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               compatible = "kendryte,k210-spi",
+                               compatible = "canaan,kendryte-k210-spi",
+                                            "snps,dw-apb-ssi-4.01",
                                             "snps,dw-apb-ssi";
                                reg = <0x53000000 0x100>;
                                interrupts = <2>;
@@ -589,8 +592,8 @@
                        spi3: spi@54000000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               compatible = "kendryte,k210-spi",
-                                            "snps,dw-apb-ssi";
+                               compatible = "canaan,kendryte-k210-ssi",
+                                            "snps,dwc-ssi-1.01a";
                                reg = <0x54000000 0x200>;
                                interrupts = <4>;
                                clocks = <&sysclk K210_CLK_SPI3>;