Unverified Commit 6230d6ca authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

spi: fsl-dspi: switch to use modern name 



Change legacy name master/target to modern name host/target or controller.

No functional changed.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230807124105.3429709-7-yangyingliang@huawei.com


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

drivers/spi/spi-fsl-dspi.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define DRIVER_NAME			"fsl-dspi"

#define DRIVER_NAME			"fsl-dspi"





#define SPI_MCR				0x00

#define SPI_MCR				0x00

#define SPI_MCR_MASTER			BIT(31)

#define SPI_MCR_HOST			BIT(31)

#define SPI_MCR_PCSIS(x)		((x) << 16)

#define SPI_MCR_PCSIS(x)		((x) << 16)

#define SPI_MCR_CLR_TXF			BIT(11)

#define SPI_MCR_CLR_TXF			BIT(11)

#define SPI_MCR_CLR_RXF			BIT(10)

#define SPI_MCR_CLR_RXF			BIT(10)
@@ -340,7 +340,7 @@ static u32 dspi_pop_tx_pushr(struct fsl_dspi *dspi) 
{

{

	u16 cmd = dspi->tx_cmd, data = dspi_pop_tx(dspi);

	u16 cmd = dspi->tx_cmd, data = dspi_pop_tx(dspi);





	if (spi_controller_is_slave(dspi->ctlr))

	if (spi_controller_is_target(dspi->ctlr))

		return data;

		return data;





	if (dspi->len > 0)

	if (dspi->len > 0)
@@ -430,7 +430,7 @@ static int dspi_next_xfer_dma_submit(struct fsl_dspi *dspi) 
	dma_async_issue_pending(dma->chan_rx);

	dma_async_issue_pending(dma->chan_rx);

	dma_async_issue_pending(dma->chan_tx);

	dma_async_issue_pending(dma->chan_tx);





	if (spi_controller_is_slave(dspi->ctlr)) {

	if (spi_controller_is_target(dspi->ctlr)) {

		wait_for_completion_interruptible(&dspi->dma->cmd_rx_complete);

		wait_for_completion_interruptible(&dspi->dma->cmd_rx_complete);

		return 0;

		return 0;

	}

	}
@@ -1061,7 +1061,7 @@ static int dspi_setup(struct spi_device *spi) 
	if (spi->mode & SPI_CPHA)

	if (spi->mode & SPI_CPHA)

		chip->ctar_val |= SPI_CTAR_CPHA;

		chip->ctar_val |= SPI_CTAR_CPHA;





	if (!spi_controller_is_slave(dspi->ctlr)) {

	if (!spi_controller_is_target(dspi->ctlr)) {

		chip->ctar_val |= SPI_CTAR_PCSSCK(pcssck) |

		chip->ctar_val |= SPI_CTAR_PCSSCK(pcssck) |

				  SPI_CTAR_CSSCK(cssck) |

				  SPI_CTAR_CSSCK(cssck) |

				  SPI_CTAR_PASC(pasc) |

				  SPI_CTAR_PASC(pasc) |
@@ -1216,8 +1216,8 @@ static int dspi_init(struct fsl_dspi *dspi) 




	if (dspi->devtype_data->trans_mode == DSPI_XSPI_MODE)

	if (dspi->devtype_data->trans_mode == DSPI_XSPI_MODE)

		mcr |= SPI_MCR_XSPI;

		mcr |= SPI_MCR_XSPI;

	if (!spi_controller_is_slave(dspi->ctlr))

	if (!spi_controller_is_target(dspi->ctlr))

		mcr |= SPI_MCR_MASTER;

		mcr |= SPI_MCR_HOST;





	regmap_write(dspi->regmap, SPI_MCR, mcr);

	regmap_write(dspi->regmap, SPI_MCR, mcr);

	regmap_write(dspi->regmap, SPI_SR, SPI_SR_CLEAR);

	regmap_write(dspi->regmap, SPI_SR, SPI_SR_CLEAR);
@@ -1240,13 +1240,13 @@ static int dspi_init(struct fsl_dspi *dspi) 
	return 0;

	return 0;

}

}





static int dspi_slave_abort(struct spi_master *master)

static int dspi_target_abort(struct spi_controller *host)

{

{

	struct fsl_dspi *dspi = spi_master_get_devdata(master);

	struct fsl_dspi *dspi = spi_controller_get_devdata(host);





	/*

	/*

	 * Terminate all pending DMA transactions for the SPI working

	 * Terminate all pending DMA transactions for the SPI working

	 * in SLAVE mode.

	 * in TARGET mode.

	 */

	 */

	if (dspi->devtype_data->trans_mode == DSPI_DMA_MODE) {

	if (dspi->devtype_data->trans_mode == DSPI_DMA_MODE) {

		dmaengine_terminate_sync(dspi->dma->chan_rx);

		dmaengine_terminate_sync(dspi->dma->chan_rx);
@@ -1277,7 +1277,7 @@ static int dspi_probe(struct platform_device *pdev) 
	if (!dspi)

	if (!dspi)

		return -ENOMEM;

		return -ENOMEM;





	ctlr = spi_alloc_master(&pdev->dev, 0);

	ctlr = spi_alloc_host(&pdev->dev, 0);

	if (!ctlr)

	if (!ctlr)

		return -ENOMEM;

		return -ENOMEM;
@@ -1292,7 +1292,7 @@ static int dspi_probe(struct platform_device *pdev) 
	ctlr->dev.of_node = pdev->dev.of_node;

	ctlr->dev.of_node = pdev->dev.of_node;





	ctlr->cleanup = dspi_cleanup;

	ctlr->cleanup = dspi_cleanup;

	ctlr->slave_abort = dspi_slave_abort;

	ctlr->target_abort = dspi_target_abort;

	ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;

	ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;

	ctlr->use_gpio_descriptors = true;

	ctlr->use_gpio_descriptors = true;
@@ -1317,7 +1317,7 @@ static int dspi_probe(struct platform_device *pdev) 
		ctlr->bus_num = bus_num;

		ctlr->bus_num = bus_num;





		if (of_property_read_bool(np, "spi-slave"))

		if (of_property_read_bool(np, "spi-slave"))

			ctlr->slave = true;

			ctlr->target = true;





		dspi->devtype_data = of_device_get_match_data(&pdev->dev);

		dspi->devtype_data = of_device_get_match_data(&pdev->dev);

		if (!dspi->devtype_data) {

		if (!dspi->devtype_data) {