diff options
| author | Sean Anderson <seanga2@gmail.com> | 2020-10-16 18:57:45 -0400 |
|---|---|---|
| committer | Jagan Teki <jagan@amarulasolutions.com> | 2020-12-18 16:16:36 +0530 |
| commit | 13fc44e2223b90290a2bfdfe97d3a9d37b90c7a0 (patch) | |
| tree | 6ec133819f71159612ad83c0839d27db9008925b | |
| parent | 1b3dd491e6fc787f47a3ae91f6a58aeb97466140 (diff) | |
| download | u-boot-13fc44e2223b90290a2bfdfe97d3a9d37b90c7a0.zip u-boot-13fc44e2223b90290a2bfdfe97d3a9d37b90c7a0.tar.gz u-boot-13fc44e2223b90290a2bfdfe97d3a9d37b90c7a0.tar.bz2 | |
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>
| -rw-r--r-- | arch/arc/dts/axs10x_mb.dtsi | 3 | ||||
| -rw-r--r-- | arch/arc/dts/hsdk-common.dtsi | 3 | ||||
| -rw-r--r-- | drivers/spi/designware_spi.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi index 33b0593..daf7ca6 100644 --- 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 9aa10e4..a4b348b 100644 --- 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 b23655d..32de33f 100644 --- 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; |