Unverified Commit 9e264f3f authored by Amit Kumar Mahapatra via Alsa-devel's avatar Amit Kumar Mahapatra via Alsa-devel Committed by Mark Brown
Browse files

spi: Replace all spi->chip_select and spi->cs_gpiod references with function call 



Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod
members of struct spi_device to be an array. But changing the type of these
members to array would break the spi driver functionality. To make the
transition smoother introduced four new APIs to get/set the
spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and
spi->cs_gpiod references with get or set API calls.
While adding multi-cs support in further patches the chip_select & cs_gpiod
members of the spi_device structure would be converted to arrays & the
"idx" parameter of the APIs would be used as array index i.e.,
spi->chip_select[idx] & spi->cs_gpiod[idx] respectively.

Signed-off-by: default avatarAmit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
Acked-by: Heiko Stuebner <heiko@sntech.de> # Rockchip drivers
Reviewed-by: default avatarMichal Simek <michal.simek@amd.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org> # Aspeed driver
Reviewed-by: Dhruva Gole <d-gole@ti.com> # SPI Cadence QSPI
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> # spi-stm32-qspi
Acked-by: William Zhang <william.zhang@broadcom.com> # bcm63xx-hsspi driver
Reviewed-by: Serge Semin <fancer.lancer@gmail.com> # DW SSI part
Link: https://lore.kernel.org/r/167847070432.26.15076794204368669839@mailman-core.alsa-project.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 21d19e60

drivers/spi/spi-altera-core.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void altera_spi_set_cs(struct spi_device *spi, bool is_high) 
		altr_spi_writel(hw, ALTERA_SPI_TARGET_SEL, 0);

	} else {

		altr_spi_writel(hw, ALTERA_SPI_TARGET_SEL,

				BIT(spi->chip_select));

				BIT(spi_get_chipselect(spi, 0)));

		hw->imr |= ALTERA_SPI_CONTROL_SSO_MSK;

		altr_spi_writel(hw, ALTERA_SPI_CONTROL, hw->imr);

	}

drivers/spi/spi-amd.c

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi, 
	case AMD_SPI_V1:

		break;

	case AMD_SPI_V2:

		amd_spi_clear_chip(amd_spi, message->spi->chip_select);

		amd_spi_clear_chip(amd_spi, spi_get_chipselect(message->spi, 0));

		break;

	default:

		return -ENODEV;
@@ -364,7 +364,7 @@ static int amd_spi_master_transfer(struct spi_master *master, 
	struct amd_spi *amd_spi = spi_master_get_devdata(master);

	struct spi_device *spi = msg->spi;



	amd_spi_select_chip(amd_spi, spi->chip_select);

	amd_spi_select_chip(amd_spi, spi_get_chipselect(spi, 0));



	/*

	 * Extract spi_transfers from the spi message and

drivers/spi/spi-ar934x.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int ar934x_spi_transfer_one_message(struct spi_controller *ctlr, 
				iowrite32(reg, sp->base + AR934X_SPI_DATAOUT);

			}



			reg = AR934X_SPI_SHIFT_VAL(spi->chip_select, term,

			reg = AR934X_SPI_SHIFT_VAL(spi_get_chipselect(spi, 0), term,

						   trx_cur * 8);

			iowrite32(reg, sp->base + AR934X_SPI_REG_SHIFT_CTRL);

			stat = readl_poll_timeout(

drivers/spi/spi-armada-3700.c

+2 −2
Original line number Diff line number Diff line
@@ -437,9 +437,9 @@ static void a3700_spi_set_cs(struct spi_device *spi, bool enable) 
	struct a3700_spi *a3700_spi = spi_controller_get_devdata(spi->controller);



	if (!enable)

		a3700_spi_activate_cs(a3700_spi, spi->chip_select);

		a3700_spi_activate_cs(a3700_spi, spi_get_chipselect(spi, 0));

	else

		a3700_spi_deactivate_cs(a3700_spi, spi->chip_select);

		a3700_spi_deactivate_cs(a3700_spi, spi_get_chipselect(spi, 0));

}



static void a3700_spi_header_set(struct a3700_spi *a3700_spi)

drivers/spi/spi-aspeed-smc.c

+7 −6
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static const struct aspeed_spi_data ast2400_spi_data; 
static int do_aspeed_spi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master);

	struct aspeed_spi_chip *chip = &aspi->chips[mem->spi->chip_select];

	struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(mem->spi, 0)];

	u32 addr_mode, addr_mode_backup;

	u32 ctl_val;

	int ret = 0;
@@ -377,7 +377,8 @@ static const char *aspeed_spi_get_name(struct spi_mem *mem) 
	struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master);

	struct device *dev = aspi->dev;



	return devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev), mem->spi->chip_select);

	return devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev),

			      spi_get_chipselect(mem->spi, 0));

}



struct aspeed_spi_window {
@@ -553,7 +554,7 @@ static int aspeed_spi_do_calibration(struct aspeed_spi_chip *chip); 
static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master);

	struct aspeed_spi_chip *chip = &aspi->chips[desc->mem->spi->chip_select];

	struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)];

	struct spi_mem_op *op = &desc->info.op_tmpl;

	u32 ctl_val;

	int ret = 0;
@@ -620,7 +621,7 @@ static ssize_t aspeed_spi_dirmap_read(struct spi_mem_dirmap_desc *desc, 
				      u64 offset, size_t len, void *buf)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master);

	struct aspeed_spi_chip *chip = &aspi->chips[desc->mem->spi->chip_select];

	struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)];



	/* Switch to USER command mode if mapping window is too small */

	if (chip->ahb_window_size < offset + len) {
@@ -670,7 +671,7 @@ static int aspeed_spi_setup(struct spi_device *spi) 
{

	struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master);

	const struct aspeed_spi_data *data = aspi->data;

	unsigned int cs = spi->chip_select;

	unsigned int cs = spi_get_chipselect(spi, 0);

	struct aspeed_spi_chip *chip = &aspi->chips[cs];



	chip->aspi = aspi;
@@ -697,7 +698,7 @@ static int aspeed_spi_setup(struct spi_device *spi) 
static void aspeed_spi_cleanup(struct spi_device *spi)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master);

	unsigned int cs = spi->chip_select;

	unsigned int cs = spi_get_chipselect(spi, 0);



	aspeed_spi_chip_enable(aspi, cs, false);