Skip to contentSkip to conversation

spi: gpio: Convert to be used outside of OF

PATCH In review Andy Shevchenko 2 participants 9 messages May 17, 2024 – Jun 6, 2024 SPI

lore
Share & tools
lore
#0 lore raw

cover spi: gpio: Convert to be used outside of OF

Convert the driver to be used outside of OF and a couple of cleanups.

Andy Shevchenko (3):
spi: gpio: Make use of device properties
spi: gpio: Use traditional pattern when checking error codes
spi: gpio: Make num_chipselect 8-bit in the struct
spi_gpio_platform_data

 drivers/spi/spi-gpio.c       | 66 ++++++++++++++----------------------
 include/linux/spi/spi_gpio.h |  2 +-
 2 files changed, 26 insertions(+), 42 deletions(-)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#1 lore raw

PATCH 1/3 spi: gpio: Make use of device properties

Convert the module to be property provider agnostic and allow it to be used on non-OF platforms.

Include mod_devicetable.h explicitly to replace the dropped of.h which included mod_devicetable.h indirectly.

---
 drivers/spi/spi-gpio.c | 51 +++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 33 deletions(-)
drivers/spi/spi-gpio.c +18 -33
index 909cce109bba..abf426711c22 100644
@@ -5,17 +5,17 @@
  * Copyright (C) 2006,2008 David Brownell
  * Copyright (C) 2017 Linus Walleij
  */
+#include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/gpio/consumer.h>
-#include <linux/of.h>
+#include <linux/property.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 #include <linux/spi/spi_gpio.h>
 
-
 /*
  * This bitbanging SPI host driver should help make systems usable
  * when a native hardware SPI engine is not available, perhaps because
@@ -326,29 +326,6 @@ static int spi_gpio_request(struct device *dev, struct spi_gpio *spi_gpio)
 	return PTR_ERR_OR_ZERO(spi_gpio->sck);
 }
 
-#ifdef CONFIG_OF
-static const struct of_device_id spi_gpio_dt_ids[] = {
-	{ .compatible = "spi-gpio" },
-	{}
-};
-MODULE_DEVICE_TABLE(of, spi_gpio_dt_ids);
-
-static int spi_gpio_probe_dt(struct platform_device *pdev,
-			     struct spi_controller *host)
-{
-	host->dev.of_node = pdev->dev.of_node;
-	host->use_gpio_descriptors = true;
-
-	return 0;
-}
-#else
-static inline int spi_gpio_probe_dt(struct platform_device *pdev,
-				    struct spi_controller *host)
-{
-	return 0;
-}
-#endif
-
 static int spi_gpio_probe_pdata(struct platform_device *pdev,
 				struct spi_controller *host)
 {
@@ -389,19 +366,21 @@ static int spi_gpio_probe(struct platform_device *pdev)
 	struct spi_controller		*host;
 	struct spi_gpio			*spi_gpio;
 	struct device			*dev = &pdev->dev;
+	struct fwnode_handle		*fwnode = dev_fwnode(dev);
 	struct spi_bitbang		*bb;
 
 	host = devm_spi_alloc_host(dev, sizeof(*spi_gpio));
 	if (!host)
 		return -ENOMEM;
 
-	if (pdev->dev.of_node)
-		status = spi_gpio_probe_dt(pdev, host);
-	else
+	if (fwnode) {
+		device_set_node(&host->dev, fwnode);
+		host->use_gpio_descriptors = true;
+	} else {
 		status = spi_gpio_probe_pdata(pdev, host);
-
-	if (status)
-		return status;
+		if (status)
+			return status;
+	}
 
 	spi_gpio = spi_controller_get_devdata(host);
 
@@ -459,10 +438,16 @@ static int spi_gpio_probe(struct platform_device *pdev)
 
 MODULE_ALIAS("platform:" DRIVER_NAME);
 
+static const struct of_device_id spi_gpio_dt_ids[] = {
+	{ .compatible = "spi-gpio" },
+	{}
+};
+MODULE_DEVICE_TABLE(of, spi_gpio_dt_ids);
+
 static struct platform_driver spi_gpio_driver = {
 	.driver = {
 		.name	= DRIVER_NAME,
-		.of_match_table = of_match_ptr(spi_gpio_dt_ids),
+		.of_match_table = spi_gpio_dt_ids,
 	},
 	.probe		= spi_gpio_probe,
 };
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#2 lore raw

PATCH 2/3 spi: gpio: Use traditional pattern when checking error codes

In reply to Andy Shevchenko

Instead of 'if (!ret)' switch to "check for the error first" rule.

---
 drivers/spi/spi-gpio.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/spi/spi-gpio.c +7 -8
index abf426711c22..36c587be9e28 100644
@@ -239,8 +239,8 @@ static void spi_gpio_chipselect(struct spi_device *spi, int is_active)
 static int spi_gpio_setup(struct spi_device *spi)
 {
 	struct gpio_desc	*cs;
-	int			status = 0;
 	struct spi_gpio		*spi_gpio = spi_to_spi_gpio(spi);
+	int ret;
 
 	/*
 	 * The CS GPIOs have already been
@@ -248,15 +248,14 @@ static int spi_gpio_setup(struct spi_device *spi)
 	 */
 	if (spi_gpio->cs_gpios) {
 		cs = spi_gpio->cs_gpios[spi_get_chipselect(spi, 0)];
-		if (!spi->controller_state && cs)
-			status = gpiod_direction_output(cs,
-						  !(spi->mode & SPI_CS_HIGH));
+		if (!spi->controller_state && cs) {
+			ret = gpiod_direction_output(cs, !(spi->mode & SPI_CS_HIGH));
+			if (ret)
+				return ret;
+		}
 	}
 
-	if (!status)
-		status = spi_bitbang_setup(spi);
-
-	return status;
+	return spi_bitbang_setup(spi);
 }
 
 static int spi_gpio_set_direction(struct spi_device *spi, bool output)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#3 lore raw

PATCH 3/3 spi: gpio: Make num_chipselect 8-bit in the struct spi_gpio_platform_data

In reply to Andy Shevchenko

There is no use for whole 16-bit for the number of chip select pins. Drop it to 8 bits.

---
 include/linux/spi/spi_gpio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/spi/spi_gpio.h +1 -1
index 5f0e1407917a..30f29df811a4 100644
@@ -19,7 +19,7 @@
  * @num_chipselect: how many target devices to allow
  */
 struct spi_gpio_platform_data {
-	u16		num_chipselect;
+	u8	num_chipselect;
 };
 
 #endif /* __LINUX_SPI_GPIO_H */
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
maintainer
#4 lore raw

Re: [PATCH v1 3/3] spi: gpio: Make num_chipselect 8-bit in the struct spi_gpio_platform_data

Quoted 2 lines · Andy Shevchenko

There is no use for whole 16-bit for the number of chip select pins. Drop it to 8 bits.

because...? It's the only field in the struct so it's not like it makes any meaningful different to struct layout.

#5 lore raw

Re: [PATCH v1 3/3] spi: gpio: Make num_chipselect 8-bit in the struct spi_gpio_platform_data

Quoted 5 lines · Mark Brown
Quoted 2 lines · Andy Shevchenko

There is no use for whole 16-bit for the number of chip select pins. Drop it to 8 bits.

because...?

To make the type stricter, but since there is no other benefits and this one likely won't help to catch the (incorrect) use of big numbers I think we don't need it.

Quoted 2 lines

It's the only field in the struct so it's not like it makes any meaningful different to struct layout.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw

Re: [PATCH v1 3/3] spi: gpio: Make num_chipselect 8-bit in the struct spi_gpio_platform_data

Quoted 13 lines · Andy Shevchenko
Quoted 5 lines · Mark Brown
Quoted 2 lines · Andy Shevchenko

There is no use for whole 16-bit for the number of chip select pins. Drop it to 8 bits.

because...?

To make the type stricter, but since there is no other benefits and this one likely won't help to catch the (incorrect) use of big numbers I think we don't need it.

Quoted 2 lines

It's the only field in the struct so it's not like it makes any meaningful different to struct layout.

Should I do something about the first two patches or is it fine to get them in?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#7 lore raw

Re: [PATCH v1 3/3] spi: gpio: Make num_chipselect 8-bit in the struct spi_gpio_platform_data

Quoted 1 line · Andy Shevchenko

Should I do something about the first two patches or is it fine to get them in?

Please don't send content free pings and please allow a reasonable time for review. People get busy, go on holiday, attend conferences and so on so unless there is some reason for urgency (like critical bug fixes) please allow at least a couple of weeks for review. If there have been review comments then people may be waiting for those to be addressed.

Sending content free pings adds to the mail volume (if they are seen at all) which is often the problem and since they can't be reviewed directly if something has gone wrong you'll have to resend the patches anyway, so sending again is generally a better approach though there are some other maintainers who like them - if in doubt look at how patches for the subsystem are normally handled.

#8 lore raw

Re: [PATCH v1 3/3] spi: gpio: Make num_chipselect 8-bit in the struct spi_gpio_platform_data

Quoted 3 lines · Mark Brown
Quoted 1 line · Andy Shevchenko

Should I do something about the first two patches or is it fine to get them in?

Found them, it's just an announce is missing.
Thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko