spi: soft_spi: Support the recommended soft spi properties

According to Documentation/devicetree/bindings/spi/spi-gpio.yaml
from Linux, the recommended spio-gpio properties are:

sck-gpios, miso-gpios and mosi-gpios.

gpio-sck, gpio-mosi and gpio-miso are considered deprecated.

Currently, U-Boot only supports the deprecated properties.

Allow the soft_spi driver to support both the new and old properties.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index f3602a25ba3008d0bd80f276f37e5fc1d9658fb9..0fa14339bdcd95180e491372042cce7316cfec62 100644 (file)
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -248,19 +248,32 @@ static int soft_spi_probe(struct udevice *dev)
        cs_flags = (slave && slave->mode & SPI_CS_HIGH) ? 0 : GPIOD_ACTIVE_LOW;
        clk_flags = (slave && slave->mode & SPI_CPOL) ? GPIOD_ACTIVE_LOW : 0;
 
-       if (gpio_request_by_name(dev, "cs-gpios", 0, &plat->cs,
-                                GPIOD_IS_OUT | cs_flags) ||
-           gpio_request_by_name(dev, "gpio-sck", 0, &plat->sclk,
-                                GPIOD_IS_OUT | clk_flags))
+       ret = gpio_request_by_name(dev, "cs-gpios", 0, &plat->cs,
+                                  GPIOD_IS_OUT | cs_flags);
+       if (ret)
+               return -EINVAL;
+
+       ret = gpio_request_by_name(dev, "gpio-sck", 0, &plat->sclk,
+                                  GPIOD_IS_OUT | clk_flags);
+       if (ret)
+               ret = gpio_request_by_name(dev, "sck-gpios", 0, &plat->sclk,
+                                          GPIOD_IS_OUT | clk_flags);
+       if (ret)
                return -EINVAL;
 
        ret = gpio_request_by_name(dev, "gpio-mosi", 0, &plat->mosi,
                                   GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
+       if (ret)
+               ret = gpio_request_by_name(dev, "mosi-gpios", 0, &plat->mosi,
+                                          GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
        if (ret)
                plat->flags |= SPI_MASTER_NO_TX;
 
        ret = gpio_request_by_name(dev, "gpio-miso", 0, &plat->miso,
                                   GPIOD_IS_IN);
+       if (ret)
+               ret = gpio_request_by_name(dev, "gpio-miso", 0, &plat->miso,
+                                          GPIOD_IS_IN);
        if (ret)
                plat->flags |= SPI_MASTER_NO_RX;