Unverified Commit 82238d2c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230710154932.68377-14-andriy.shevchenko@linux.intel.com


Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 90366cd6

drivers/spi/spi-ath79.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/spi/spi-atmel.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/spi/spi-bitbang.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/spi/spi-davinci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/spi/spi-dw-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */