spi: Rename SPI_MASTER_GPIO_SS to SPI_CONTROLLER_GPIO_SS

Rename SPI_MASTER_GPIO_SS to SPI_CONTROLLER_GPIO_SS and
convert the users to SPI_CONTROLLER_GPIO_SS to follow
the new naming shema.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230710154932.68377-14-andriy.shevchenko@linux.intel.com
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index d3dd213..1b6d977 100644 (file)
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -185,7 +185,7 @@ static int ath79_spi_probe(struct platform_device *pdev)
 
        host->use_gpio_descriptors = true;
        host->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
-       host->flags = SPI_MASTER_GPIO_SS;
+       host->flags = SPI_CONTROLLER_GPIO_SS;
        host->num_chipselect = 3;
        host->mem_ops = &ath79_mem_ops;
 

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 0865993..9674499 100644 (file)
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1476,7 +1476,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
        host->num_chipselect = 4;
        host->setup = atmel_spi_setup;
        host->flags = (SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX |
-                       SPI_MASTER_GPIO_SS);
+                       SPI_CONTROLLER_GPIO_SS);
        host->transfer_one = atmel_spi_one_transfer;
        host->set_cs = atmel_spi_set_cs;
        host->cleanup = atmel_spi_cleanup;

diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index 862f209..ecd4401 100644 (file)
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -349,11 +349,11 @@ int spi_bitbang_init(struct spi_bitbang *bitbang)
        /*
         * We only need the chipselect callback if we are actually using it.
         * If we just use GPIO descriptors, it is surplus. If the
-        * SPI_MASTER_GPIO_SS flag is set, we always need to call the
+        * SPI_CONTROLLER_GPIO_SS flag is set, we always need to call the
         * driver-specific chipselect routine.
         */
        custom_cs = (!master->use_gpio_descriptors ||
-                    (master->flags & SPI_MASTER_GPIO_SS));
+                    (master->flags & SPI_CONTROLLER_GPIO_SS));
 
        if (custom_cs && !bitbang->chipselect)
                return -EINVAL;
@@ -371,7 +371,7 @@ int spi_bitbang_init(struct spi_bitbang *bitbang)
        master->transfer_one = spi_bitbang_transfer_one;
        /*
         * When using GPIO descriptors, the ->set_cs() callback doesn't even
-        * get called unless SPI_MASTER_GPIO_SS is set.
+        * get called unless SPI_CONTROLLER_GPIO_SS is set.
         */
        if (custom_cs)
                master->set_cs = spi_bitbang_set_cs;

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 0143924..7ea2ac0 100644 (file)
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -939,7 +939,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
        master->bus_num = pdev->id;
        master->num_chipselect = pdata->num_chipselect;
        master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 16);
-       master->flags = SPI_CONTROLLER_MUST_RX | SPI_MASTER_GPIO_SS;
+       master->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_GPIO_SS;
        master->setup = davinci_spi_setup;
        master->cleanup = davinci_spi_cleanup;
        master->can_dma = davinci_spi_can_dma;

diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c
index a8ba41a..45f5acc 100644 (file)
--- a/drivers/spi/spi-dw-core.c
+++ b/drivers/spi/spi-dw-core.c
@@ -932,7 +932,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
        if (dws->mem_ops.exec_op)
                master->mem_ops = &dws->mem_ops;
        master->max_speed_hz = dws->max_freq;
-       master->flags = SPI_MASTER_GPIO_SS;
+       master->flags = SPI_CONTROLLER_GPIO_SS;
        master->auto_runtime_pm = true;
 
        /* Get default rx sample delay */

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 85e149e..612db47 100644 (file)
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -434,7 +434,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
         * line, that we need to do on selection. This makes the local
         * callback for chipselect always get called.
         */
-       master->flags |= SPI_MASTER_GPIO_SS;
+       master->flags |= SPI_CONTROLLER_GPIO_SS;
        bb->chipselect = spi_gpio_chipselect;
        bb->set_line_direction = spi_gpio_set_direction;
 

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 528ae46..8d97f2b 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1779,7 +1779,7 @@ static int spi_imx_probe(struct platform_device *pdev)
 
        if (is_imx51_ecspi(spi_imx) || is_imx53_ecspi(spi_imx)) {
                controller->max_native_cs = 4;
-               controller->flags |= SPI_MASTER_GPIO_SS;
+               controller->flags |= SPI_CONTROLLER_GPIO_SS;
        }
 
        spi_imx->spi_drctl = spi_drctl;

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index ad9e83e..4882aaf 100644 (file)
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -677,7 +677,7 @@ static int orion_spi_probe(struct platform_device *pdev)
        master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16);
        master->auto_runtime_pm = true;
        master->use_gpio_descriptors = true;
-       master->flags = SPI_MASTER_GPIO_SS;
+       master->flags = SPI_CONTROLLER_GPIO_SS;
 
        platform_set_drvdata(pdev, master);
 

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 143ede9..a379438 100644 (file)
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -858,7 +858,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
                ctlr->mode_bits |= SPI_NO_CS;
                ctlr->slave_abort = rockchip_spi_slave_abort;
        } else {
-               ctlr->flags = SPI_MASTER_GPIO_SS;
+               ctlr->flags = SPI_CONTROLLER_GPIO_SS;
                ctlr->max_native_cs = ROCKCHIP_SPI_MAX_CS_NUM;
                /*
                 * rk spi0 has two native cs, spi1..5 one cs only

diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index dae9e09..2f77dae 100644 (file)
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -379,7 +379,7 @@ static int sifive_spi_probe(struct platform_device *pdev)
         * we need to "left-align" the bits (unless SPI_LSB_FIRST)
         */
        master->bits_per_word_mask = SPI_BPW_MASK(8);
-       master->flags = SPI_CONTROLLER_MUST_TX | SPI_MASTER_GPIO_SS;
+       master->flags = SPI_CONTROLLER_MUST_TX | SPI_CONTROLLER_GPIO_SS;
        master->prepare_message = sifive_spi_prepare_message;
        master->set_cs = sifive_spi_set_cs;
        master->transfer_one = sifive_spi_transfer_one;

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 4c90875..d9667f3 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1006,7 +1006,7 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
                                gpiod_set_value_cansleep(spi_get_csgpiod(spi, 0), activate);
                }
                /* Some SPI masters need both GPIO CS & slave_select */
-               if ((spi->controller->flags & SPI_MASTER_GPIO_SS) &&
+               if ((spi->controller->flags & SPI_CONTROLLER_GPIO_SS) &&
                    spi->controller->set_cs)
                        spi->controller->set_cs(spi, !enable);
        } else if (spi->controller->set_cs) {
@@ -3052,7 +3052,7 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr)
 
        ctlr->unused_native_cs = ffs(~native_cs_mask) - 1;
 
-       if ((ctlr->flags & SPI_MASTER_GPIO_SS) && num_cs_gpios &&
+       if ((ctlr->flags & SPI_CONTROLLER_GPIO_SS) && num_cs_gpios &&
            ctlr->max_native_cs && ctlr->unused_native_cs >= ctlr->max_native_cs) {
                dev_err(dev, "No unused native chip select available\n");
                return -EINVAL;

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index becad31..39a2e61 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -562,8 +562,7 @@ struct spi_controller {
 #define SPI_CONTROLLER_NO_TX           BIT(2)  /* Can't do buffer write */
 #define SPI_CONTROLLER_MUST_RX         BIT(3)  /* Requires rx */
 #define SPI_CONTROLLER_MUST_TX         BIT(4)  /* Requires tx */
-
-#define SPI_MASTER_GPIO_SS             BIT(5)  /* GPIO CS must select slave */
+#define SPI_CONTROLLER_GPIO_SS         BIT(5)  /* GPIO CS must select slave */
 
        /* Flag indicating if the allocation of this struct is devres-managed */
        bool                    devm_allocated;