spi: bcm2835aux: Convert to use GPIO descriptors

This one is pretty straight forward to switch over, the driver
already relies on inspecting cs_gpio just check cs_gpiod instead
and stop the special handling of requesting the GPIO and stuff
the core will take care of.

Cc: Lukas Wunner <lukas@wunner.de>
Cc: Martin Sperl <kernel@martin.sperl.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220201012956.563272-1-linus.walleij@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
index 7d709a8..e285219 100644 (file)
--- a/drivers/spi/spi-bcm2835aux.c
+++ b/drivers/spi/spi-bcm2835aux.c
@@ -22,7 +22,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
-#include <linux/of_gpio.h>
 #include <linux/of_irq.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
@@ -445,25 +444,12 @@ static void bcm2835aux_spi_handle_err(struct spi_master *master,
 
 static int bcm2835aux_spi_setup(struct spi_device *spi)
 {
-       int ret;
-
        /* sanity check for native cs */
        if (spi->mode & SPI_NO_CS)
                return 0;
-       if (gpio_is_valid(spi->cs_gpio)) {
-               /* with gpio-cs set the GPIO to the correct level
-                * and as output (in case the dt has the gpio not configured
-                * as output but native cs)
-                */
-               ret = gpio_direction_output(spi->cs_gpio,
-                                           (spi->mode & SPI_CS_HIGH) ? 0 : 1);
-               if (ret)
-                       dev_err(&spi->dev,
-                               "could not set gpio %i as output: %i\n",
-                               spi->cs_gpio, ret);
-
-               return ret;
-       }
+
+       if (spi->cs_gpiod)
+               return 0;
 
        /* for dt-backwards compatibility: only support native on CS0
         * known things not supported with broken native CS:
@@ -519,6 +505,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
        master->prepare_message = bcm2835aux_spi_prepare_message;
        master->unprepare_message = bcm2835aux_spi_unprepare_message;
        master->dev.of_node = pdev->dev.of_node;
+       master->use_gpio_descriptors = true;
 
        bs = spi_master_get_devdata(master);