spi: fsl_dspi: rename num-cs to spi-num-chipselects

The official devicetree bindings specifies spi-num-chipselects as the
name. Use it.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi
index 2894842cf2533787ee98b15f6aeeedadf125bf03..dcdcd444b34d08d7e6ea80e1c53329cde79e8059 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a.dtsi
+++ b/arch/arm/dts/fsl-ls1012a.dtsi
@@ -49,7 +49,7 @@
                        interrupts = <0 64 0x4>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <6>;
+                       spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
                };

diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi
index 6158a1362a050305331c647e3a3a5b14216a2c60..7da32561a4da55b442330d1ca2eb695b1fa6e7d5 100644 (file)
--- a/arch/arm/dts/fsl-ls1028a.dtsi
+++ b/arch/arm/dts/fsl-ls1028a.dtsi
@@ -165,7 +165,7 @@
                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <5>;
+                       spi-num-chipselects = <5>;
                        litte-endian;
                        status = "disabled";
                };
@@ -178,7 +178,7 @@
                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <5>;
+                       spi-num-chipselects = <5>;
                        little-endian;
                        status = "disabled";
                };
@@ -191,7 +191,7 @@
                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <5>;
+                       spi-num-chipselects = <5>;
                        little-endian;
                        status = "disabled";
                };

diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi
index d8171bd03b4f8373c7f0d7c54dbc3643e7808070..3aaec8b6af9799e70a095fc72642134f1f06040f 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a.dtsi
+++ b/arch/arm/dts/fsl-ls1043a.dtsi
@@ -53,7 +53,7 @@
                        interrupts = <0 64 0x4>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <6>;
+                       spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
                };
@@ -66,7 +66,7 @@
                        interrupts = <0 65 0x4>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <6>;
+                       spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
                };

diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi
index 9df419a87d831e0b2ecf82dc367a11931186eb52..6a205cd3dfc8bb0fcabcc3a5e630e8ca045bef50 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a.dtsi
+++ b/arch/arm/dts/fsl-ls1046a.dtsi
@@ -52,7 +52,7 @@
                        interrupts = <0 64 0x4>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <6>;
+                       spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
                };
@@ -65,7 +65,7 @@
                        interrupts = <0 65 0x4>;
                        clock-names = "dspi";
                        clocks = <&clockgen 4 0>;
-                       num-cs = <6>;
+                       spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
                };

diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index 0db02b1c230c0355de4adc2ff30130de7d1043d7..73c89288581bc6060ab04445691885b47a150469 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -89,7 +89,7 @@
                #size-cells = <0>;
                reg = <0x0 0x2100000 0x0 0x10000>;
                interrupts = <0 26 0x4>; /* Level high type */
-               num-cs = <6>;
+               spi-num-chipselects = <6>;
        };
 
        qspi: quadspi@1550000 {

diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi
index 278daeeb6eea9f6264615b1fd2ecd511f4e2bf3a..72ba52594a18e8b1bccac1bc060d8e0781d855ae 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a.dtsi
+++ b/arch/arm/dts/fsl-ls2080a.dtsi
@@ -93,7 +93,7 @@
                #size-cells = <0>;
                reg = <0x0 0x2100000 0x0 0x10000>;
                interrupts = <0 26 0x4>; /* Level high type */
-               num-cs = <6>;
+               spi-num-chipselects = <6>;
        };
 
        qspi: quadspi@1550000 {

diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi
index 3b5f0d119e7644d0ebcc8fdbe018754e7ddb3f9d..52e4d7205a2647abcc2ad3849807045bf126d79e 100644 (file)
--- a/arch/arm/dts/fsl-lx2160a.dtsi
+++ b/arch/arm/dts/fsl-lx2160a.dtsi
@@ -172,7 +172,7 @@
                #size-cells = <0>;
                reg = <0x0 0x2100000 0x0 0x10000>;
                interrupts = <0 26 0x4>; /* Level high type */
-               num-cs = <6>;
+               spi-num-chipselects = <6>;
        };
 
        dspi1: dspi@2110000 {
@@ -181,7 +181,7 @@
                #size-cells = <0>;
                reg = <0x0 0x2110000 0x0 0x10000>;
                interrupts = <0 26 0x4>; /* Level high type */
-               num-cs = <6>;
+               spi-num-chipselects = <6>;
        };
 
        dspi2: dspi@2120000 {
@@ -190,7 +190,7 @@
                #size-cells = <0>;
                reg = <0x0 0x2120000 0x0 0x10000>;
                interrupts = <0 241 0x4>; /* Level high type */
-               num-cs = <6>;
+               spi-num-chipselects = <6>;
        };
 
        gpio0: gpio@2300000 {

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index 7ba2dd226932da1675060db373dfbf23853b898f..8aefc82f8788f10d229c010e03d2ee4376a0668a 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -190,7 +190,7 @@
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
                        clocks = <&platform_clk 1>;
-                       num-cs = <6>;
+                       spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
                };
@@ -203,7 +203,7 @@
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
                        clocks = <&platform_clk 1>;
-                       num-cs = <6>;
+                       spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
                };

diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi
index 5ba13dc62bc3233c53383e075873928d055827b8..1bdaf3de2303e5680347184956596b30ae0f1ea1 100644 (file)
--- a/arch/arm/dts/vf.dtsi
+++ b/arch/arm/dts/vf.dtsi
@@ -70,7 +70,7 @@
                                #size-cells = <0>;
                                compatible = "fsl,vf610-dspi";
                                reg = <0x4002c000 0x1000>;
-                               num-cs = <5>;
+                               spi-num-chipselects = <5>;
                                status = "disabled";
                        };
 
@@ -79,7 +79,7 @@
                                #size-cells = <0>;
                                compatible = "fsl,vf610-dspi";
                                reg = <0x4002d000 0x1000>;
-                               num-cs = <5>;
+                               spi-num-chipselects = <5>;
                                status = "disabled";
                        };
 

diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 23d812f47602641614638ed22d7ac98edf39d2e4..62444e408a1b0450077d086d7cdb4f6d52335c05 100644 (file)
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -586,8 +586,9 @@ static int fsl_dspi_of_to_plat(struct udevice *bus)
        if (fdtdec_get_bool(blob, node, "big-endian"))
                plat->flags |= DSPI_FLAG_REGMAP_ENDIAN_BIG;
 
-       plat->num_chipselect =
-               fdtdec_get_int(blob, node, "num-cs", FSL_DSPI_MAX_CHIPSELECT);
+       plat->num_chipselect = fdtdec_get_int(blob, node,
+                                             "spi-num-chipselects",
+                                             FSL_DSPI_MAX_CHIPSELECT);
 
        addr = dev_read_addr(bus);
        if (addr == FDT_ADDR_T_NONE) {