[PATCH 1/2] spi: soft_spi: fix miso gpio property name
Signed-off-by: Mikhail Kshevetskiy mikhail.kshevetskiy@iopsys.eu --- drivers/spi/soft_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 0fa14339bdc..3fe62818a44 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -272,7 +272,7 @@ static int soft_spi_probe(struct udevice *dev) 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, + ret = gpio_request_by_name(dev, "miso-gpios", 0, &plat->miso, GPIOD_IS_IN); if (ret) plat->flags |= SPI_MASTER_NO_RX;
From: Michael Polyntsov michael.polyntsov@iopsys.eu
Some boards don't have chipselect lines for leds so cs-gpios is not specified in the dts leading to probing error. Fix it by making behavior similar to the one in Linux, parse num-chipselects and if it is zero, ignore cs-gpios.
Signed-off-by: Michael Polyntsov michael.polyntsov@iopsys.eu Signed-off-by: Mikhail Kshevetskiy mikhail.kshevetskiy@iopsys.eu --- doc/device-tree-bindings/spi/soft-spi.txt | 5 +++-- drivers/spi/soft_spi.c | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/doc/device-tree-bindings/spi/soft-spi.txt b/doc/device-tree-bindings/spi/soft-spi.txt index bdf7e86befb..77b01b2fd9a 100644 --- a/doc/device-tree-bindings/spi/soft-spi.txt +++ b/doc/device-tree-bindings/spi/soft-spi.txt @@ -8,14 +8,15 @@ The soft SPI node requires the following properties:
Mandatory properties: compatible: "spi-gpio" -cs-gpios: GPIOs to use for SPI chip select (output) +cs-gpios: GPIOs to use for SPI chip select (output), not required if num-chipselects = <0> sck-gpios: GPIO to use for SPI clock (output) And at least one of: mosi-gpios: GPIO to use for SPI MOSI line (output) miso-gpios: GPIO to use for SPI MISO line (input)
-Optional propertie: +Optional properties: spi-delay-us: Number of microseconds of delay between each CS transition +num-chipselects: Number of chipselect lines
The GPIOs should be specified as required by the GPIO controller referenced. The first cell holds the phandle of the controller and the second cell diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 3fe62818a44..2e80b7bb08e 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -238,6 +238,18 @@ static int soft_spi_of_to_plat(struct udevice *dev) return 0; }
+static int retrieve_num_chipselects(struct udevice *dev) +{ + int chipselects; + int ret; + + ret = ofnode_read_u32(dev_ofnode(dev), "num-chipselects", &chipselects); + if (ret) + return ret; + + return chipselects; +} + static int soft_spi_probe(struct udevice *dev) { struct spi_slave *slave = dev_get_parent_priv(dev); @@ -250,7 +262,15 @@ static int soft_spi_probe(struct udevice *dev)
ret = gpio_request_by_name(dev, "cs-gpios", 0, &plat->cs, GPIOD_IS_OUT | cs_flags); - if (ret) + /* + * If num-chipselects is zero we're ignoring absence of cs-gpios. This + * code relies on the fact that `gpio_request_by_name` call above + * initiailizes plat->cs to correct value with invalid GPIO even when + * there is no cs-gpios node in dts. All other functions which work + * with plat->cs verify it via `dm_gpio_is_valid` before using it, so + * such value doesn't cause any problems. + */ + if (ret && retrieve_num_chipselects(dev) != 0) return -EINVAL;
ret = gpio_request_by_name(dev, "gpio-sck", 0, &plat->sclk,
On Thu, Jun 27, 2024 at 8:31 AM Mikhail Kshevetskiy mikhail.kshevetskiy@iopsys.eu wrote:
Signed-off-by: Mikhail Kshevetskiy mikhail.kshevetskiy@iopsys.eu
drivers/spi/soft_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 0fa14339bdc..3fe62818a44 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -272,7 +272,7 @@ static int soft_spi_probe(struct udevice *dev) 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,
ret = gpio_request_by_name(dev, "miso-gpios", 0, &plat->miso,
We should support the deprecated 'gpio-miso' property and the preferred 'miso-gpios' one.
The same applies for gpio-sck and gpio-mosi.
GPIOD_IS_IN); if (ret) plat->flags |= SPI_MASTER_NO_RX;-- 2.43.0
On 27.06.2024 14:34, Fabio Estevam wrote:
[You don't often get email from festevam@gmail.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
On Thu, Jun 27, 2024 at 8:31 AM Mikhail Kshevetskiy mikhail.kshevetskiy@iopsys.eu wrote:
Signed-off-by: Mikhail Kshevetskiy mikhail.kshevetskiy@iopsys.eu
drivers/spi/soft_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 0fa14339bdc..3fe62818a44 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -272,7 +272,7 @@ static int soft_spi_probe(struct udevice *dev) 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,
ret = gpio_request_by_name(dev, "miso-gpios", 0, &plat->miso,We should support the deprecated 'gpio-miso' property and the preferred 'miso-gpios' one.
The same applies for gpio-sck and gpio-mosi.
This is exactly what the patch did. Actually it just fix a miss-print. Other properties already have a proper fallback.
GPIOD_IS_IN); if (ret) plat->flags |= SPI_MASTER_NO_RX;-- 2.43.0
Hi Mikhail,
On Tue, Jul 2, 2024 at 6:50 AM Mikhail Kshevetskiy mikhail.kshevetskiy@genexis.eu wrote:
This is exactly what the patch did. Actually it just fix a miss-print. Other properties already have a proper fallback.
Ah, you are right.
I introduced this issue in commit 2e9fe73a883a ("spi: soft_spi: Support the recommended soft spi properties").
Please add a commit log explaining this.
Reviewed-by: Fabio Estevam festevam@gmail.com
Thanks
participants (3)
-
Fabio Estevam -
Mikhail Kshevetskiy -
Mikhail Kshevetskiy