spi: dw: Rename "cs-gpio" to "cs-gpios"

This property is named differently than other SPI drivers with the same
property, as well as the property as used in 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 33b05934387a268b649acba912f2269565c344f4..daf7ca68fb9ae26ac936fe4e39f593bd2efab232 100644 (file)
--- a/arch/arc/dts/axs10x_mb.dtsi
+++ b/arch/arc/dts/axs10x_mb.dtsi
@@ -97,7 +97,8 @@
                        spi-max-frequency = <4000000>;
                        clocks = <&apbclk>;
                        clock-names = "spi_clk";
-                       cs-gpio = <&cs_gpio 0>;
+                       num-cs = <1>;
+                       cs-gpios = <&cs_gpio 0>;
                        spi_flash@0 {
                                compatible = "jedec,spi-nor";
                                reg = <0>;

diff --git a/arch/arc/dts/hsdk-common.dtsi b/arch/arc/dts/hsdk-common.dtsi
index 9aa10e4b25d14b395169cda57a95c1470a9ef126..a4b348b9484324d31d7b2f198a9aff967b2744f7 100644 (file)
--- a/arch/arc/dts/hsdk-common.dtsi
+++ b/arch/arc/dts/hsdk-common.dtsi
@@ -135,7 +135,8 @@
                spi-max-frequency = <4000000>;
                clocks = <&cgu_clk CLK_SYS_SPI_REF>;
                clock-names = "spi_clk";
-               cs-gpio = <&cs_gpio 0>;
+               num-cs = <1>;
+               cs-gpios = <&cs_gpio 0>;
                spi_flash@0 {
                        compatible = "jedec,spi-nor";
                        reg = <0>;

diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index b23655d4d9438950994fd025f25684f0fb8c6e2d..32de33f6950d065230f44befa5bb9690d4e30134 100644 (file)
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -135,7 +135,8 @@ static int request_gpio_cs(struct udevice *bus)
        int ret;
 
        /* External chip select gpio line is optional */
-       ret = gpio_request_by_name(bus, "cs-gpio", 0, &priv->cs_gpio, 0);
+       ret = gpio_request_by_name(bus, "cs-gpios", 0, &priv->cs_gpio,
+                                  GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
        if (ret == -ENOENT)
                return 0;