spi: sh-msiof: Convert to generic unused native cs handling.

Currently the MSIOF SPI driver uses custom code to handle the unused
native chip select with GPIO chip selects.
Convert the driver to use the new generic handling in the SPI core.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200102133822.29346-3-geert+renesas@glider.be
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 8f134735291f14c31541b486b252aa5da3b2f23f..b3732dc231cb4bf367baf15c4353774e542f864f 100644 (file)
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -14,8 +14,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/err.h>
-#include <linux/gpio.h>
-#include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
@@ -55,7 +53,6 @@ struct sh_msiof_spi_priv {
        void *rx_dma_page;
        dma_addr_t tx_dma_addr;
        dma_addr_t rx_dma_addr;
-       unsigned short unused_ss;
        bool native_cs_inited;
        bool native_cs_high;
        bool slave_aborted;
@@ -587,7 +584,7 @@ static int sh_msiof_prepare_message(struct spi_controller *ctlr,
 
        /* Configure pins before asserting CS */
        if (spi->cs_gpiod) {
-               ss = p->unused_ss;
+               ss = ctlr->unused_native_cs;
                cs_high = p->native_cs_high;
        } else {
                ss = spi->chip_select;
@@ -1124,46 +1121,6 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
 }
 #endif
 
-static int sh_msiof_get_cs_gpios(struct sh_msiof_spi_priv *p)
-{
-       struct device *dev = &p->pdev->dev;
-       unsigned int used_ss_mask = 0;
-       unsigned int cs_gpios = 0;
-       unsigned int num_cs, i;
-       int ret;
-
-       ret = gpiod_count(dev, "cs");
-       if (ret <= 0)
-               return 0;
-
-       num_cs = max_t(unsigned int, ret, p->ctlr->num_chipselect);
-       for (i = 0; i < num_cs; i++) {
-               struct gpio_desc *gpiod;
-
-               gpiod = devm_gpiod_get_index(dev, "cs", i, GPIOD_ASIS);
-               if (!IS_ERR(gpiod)) {
-                       devm_gpiod_put(dev, gpiod);
-                       cs_gpios++;
-                       continue;
-               }
-
-               if (PTR_ERR(gpiod) != -ENOENT)
-                       return PTR_ERR(gpiod);
-
-               if (i >= MAX_SS) {
-                       dev_err(dev, "Invalid native chip select %d\n", i);
-                       return -EINVAL;
-               }
-               used_ss_mask |= BIT(i);
-       }
-       p->unused_ss = ffz(used_ss_mask);
-       if (cs_gpios && p->unused_ss >= MAX_SS) {
-               dev_err(dev, "No unused native chip select available\n");
-               return -EINVAL;
-       }
-       return 0;
-}
-
 static struct dma_chan *sh_msiof_request_dma_chan(struct device *dev,
        enum dma_transfer_direction dir, unsigned int id, dma_addr_t port_addr)
 {
@@ -1373,17 +1330,12 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
        if (p->info->rx_fifo_override)
                p->rx_fifo_size = p->info->rx_fifo_override;
 
-       /* Setup GPIO chip selects */
-       ctlr->num_chipselect = p->info->num_chipselect;
-       ret = sh_msiof_get_cs_gpios(p);
-       if (ret)
-               goto err1;
-
        /* init controller code */
        ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
        ctlr->mode_bits |= SPI_LSB_FIRST | SPI_3WIRE;
        ctlr->flags = chipdata->ctlr_flags;
        ctlr->bus_num = pdev->id;
+       ctlr->num_chipselect = p->info->num_chipselect;
        ctlr->dev.of_node = pdev->dev.of_node;
        ctlr->setup = sh_msiof_spi_setup;
        ctlr->prepare_message = sh_msiof_prepare_message;
@@ -1392,6 +1344,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
        ctlr->auto_runtime_pm = true;
        ctlr->transfer_one = sh_msiof_transfer_one;
        ctlr->use_gpio_descriptors = true;
+       ctlr->max_native_cs = MAX_SS;
 
        ret = sh_msiof_request_dma(p);
        if (ret < 0)