Skip to content

Commit 82238d2

Browse files
andy-shevbroonie
authored andcommitted
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>
1 parent 90366cd commit 82238d2

File tree

12 files changed

+15
-16
lines changed

12 files changed

+15
-16
lines changed

drivers/spi/spi-ath79.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static int ath79_spi_probe(struct platform_device *pdev)
185185

186186
host->use_gpio_descriptors = true;
187187
host->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
188-
host->flags = SPI_MASTER_GPIO_SS;
188+
host->flags = SPI_CONTROLLER_GPIO_SS;
189189
host->num_chipselect = 3;
190190
host->mem_ops = &ath79_mem_ops;
191191

drivers/spi/spi-atmel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
14761476
host->num_chipselect = 4;
14771477
host->setup = atmel_spi_setup;
14781478
host->flags = (SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX |
1479-
SPI_MASTER_GPIO_SS);
1479+
SPI_CONTROLLER_GPIO_SS);
14801480
host->transfer_one = atmel_spi_one_transfer;
14811481
host->set_cs = atmel_spi_set_cs;
14821482
host->cleanup = atmel_spi_cleanup;

drivers/spi/spi-bitbang.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,11 @@ int spi_bitbang_init(struct spi_bitbang *bitbang)
349349
/*
350350
* We only need the chipselect callback if we are actually using it.
351351
* If we just use GPIO descriptors, it is surplus. If the
352-
* SPI_MASTER_GPIO_SS flag is set, we always need to call the
352+
* SPI_CONTROLLER_GPIO_SS flag is set, we always need to call the
353353
* driver-specific chipselect routine.
354354
*/
355355
custom_cs = (!master->use_gpio_descriptors ||
356-
(master->flags & SPI_MASTER_GPIO_SS));
356+
(master->flags & SPI_CONTROLLER_GPIO_SS));
357357

358358
if (custom_cs && !bitbang->chipselect)
359359
return -EINVAL;
@@ -371,7 +371,7 @@ int spi_bitbang_init(struct spi_bitbang *bitbang)
371371
master->transfer_one = spi_bitbang_transfer_one;
372372
/*
373373
* When using GPIO descriptors, the ->set_cs() callback doesn't even
374-
* get called unless SPI_MASTER_GPIO_SS is set.
374+
* get called unless SPI_CONTROLLER_GPIO_SS is set.
375375
*/
376376
if (custom_cs)
377377
master->set_cs = spi_bitbang_set_cs;

drivers/spi/spi-davinci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
939939
master->bus_num = pdev->id;
940940
master->num_chipselect = pdata->num_chipselect;
941941
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 16);
942-
master->flags = SPI_CONTROLLER_MUST_RX | SPI_MASTER_GPIO_SS;
942+
master->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_GPIO_SS;
943943
master->setup = davinci_spi_setup;
944944
master->cleanup = davinci_spi_cleanup;
945945
master->can_dma = davinci_spi_can_dma;

drivers/spi/spi-dw-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
932932
if (dws->mem_ops.exec_op)
933933
master->mem_ops = &dws->mem_ops;
934934
master->max_speed_hz = dws->max_freq;
935-
master->flags = SPI_MASTER_GPIO_SS;
935+
master->flags = SPI_CONTROLLER_GPIO_SS;
936936
master->auto_runtime_pm = true;
937937

938938
/* Get default rx sample delay */

drivers/spi/spi-gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
434434
* line, that we need to do on selection. This makes the local
435435
* callback for chipselect always get called.
436436
*/
437-
master->flags |= SPI_MASTER_GPIO_SS;
437+
master->flags |= SPI_CONTROLLER_GPIO_SS;
438438
bb->chipselect = spi_gpio_chipselect;
439439
bb->set_line_direction = spi_gpio_set_direction;
440440

drivers/spi/spi-imx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1779,7 +1779,7 @@ static int spi_imx_probe(struct platform_device *pdev)
17791779

17801780
if (is_imx51_ecspi(spi_imx) || is_imx53_ecspi(spi_imx)) {
17811781
controller->max_native_cs = 4;
1782-
controller->flags |= SPI_MASTER_GPIO_SS;
1782+
controller->flags |= SPI_CONTROLLER_GPIO_SS;
17831783
}
17841784

17851785
spi_imx->spi_drctl = spi_drctl;

drivers/spi/spi-orion.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ static int orion_spi_probe(struct platform_device *pdev)
677677
master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16);
678678
master->auto_runtime_pm = true;
679679
master->use_gpio_descriptors = true;
680-
master->flags = SPI_MASTER_GPIO_SS;
680+
master->flags = SPI_CONTROLLER_GPIO_SS;
681681

682682
platform_set_drvdata(pdev, master);
683683

drivers/spi/spi-rockchip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
858858
ctlr->mode_bits |= SPI_NO_CS;
859859
ctlr->slave_abort = rockchip_spi_slave_abort;
860860
} else {
861-
ctlr->flags = SPI_MASTER_GPIO_SS;
861+
ctlr->flags = SPI_CONTROLLER_GPIO_SS;
862862
ctlr->max_native_cs = ROCKCHIP_SPI_MAX_CS_NUM;
863863
/*
864864
* rk spi0 has two native cs, spi1..5 one cs only

drivers/spi/spi-sifive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ static int sifive_spi_probe(struct platform_device *pdev)
379379
* we need to "left-align" the bits (unless SPI_LSB_FIRST)
380380
*/
381381
master->bits_per_word_mask = SPI_BPW_MASK(8);
382-
master->flags = SPI_CONTROLLER_MUST_TX | SPI_MASTER_GPIO_SS;
382+
master->flags = SPI_CONTROLLER_MUST_TX | SPI_CONTROLLER_GPIO_SS;
383383
master->prepare_message = sifive_spi_prepare_message;
384384
master->set_cs = sifive_spi_set_cs;
385385
master->transfer_one = sifive_spi_transfer_one;

0 commit comments

Comments
 (0)