spi: au1550: switch to use modern name

Change legacy name master to modern name host or controller.

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230807124105.3429709-3-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yang Yingliang 2023-08-07 20:40:47 +08:00 committed by Mark Brown
parent 40f78b74b6
commit 0c35cc597b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 37 additions and 37 deletions

View File

@ -54,7 +54,7 @@ struct au1550_spi {
int (*txrx_bufs)(struct spi_device *spi, struct spi_transfer *t); int (*txrx_bufs)(struct spi_device *spi, struct spi_transfer *t);
irqreturn_t (*irq_callback)(struct au1550_spi *hw); irqreturn_t (*irq_callback)(struct au1550_spi *hw);
struct completion master_done; struct completion host_done;
unsigned int usedma; unsigned int usedma;
u32 dma_tx_id; u32 dma_tx_id;
@ -66,7 +66,7 @@ struct au1550_spi {
unsigned int dma_rx_tmpbuf_size; unsigned int dma_rx_tmpbuf_size;
u32 dma_rx_tmpbuf_addr; u32 dma_rx_tmpbuf_addr;
struct spi_master *master; struct spi_controller *host;
struct device *dev; struct device *dev;
struct au1550_spi_info *pdata; struct au1550_spi_info *pdata;
struct resource *ioarea; struct resource *ioarea;
@ -159,7 +159,7 @@ static void au1550_spi_reset_fifos(struct au1550_spi *hw)
*/ */
static void au1550_spi_chipsel(struct spi_device *spi, int value) static void au1550_spi_chipsel(struct spi_device *spi, int value)
{ {
struct au1550_spi *hw = spi_master_get_devdata(spi->master); struct au1550_spi *hw = spi_controller_get_devdata(spi->controller);
unsigned int cspol = spi->mode & SPI_CS_HIGH ? 1 : 0; unsigned int cspol = spi->mode & SPI_CS_HIGH ? 1 : 0;
u32 cfg, stat; u32 cfg, stat;
@ -219,7 +219,7 @@ static void au1550_spi_chipsel(struct spi_device *spi, int value)
static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t) static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
{ {
struct au1550_spi *hw = spi_master_get_devdata(spi->master); struct au1550_spi *hw = spi_controller_get_devdata(spi->controller);
unsigned int bpw, hz; unsigned int bpw, hz;
u32 cfg, stat; u32 cfg, stat;
@ -272,7 +272,7 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
* no reliable way how to recognize that spi transfer is done * no reliable way how to recognize that spi transfer is done
* dma complete callbacks are called before real spi transfer is finished * dma complete callbacks are called before real spi transfer is finished
* and if only tx dma channel is set up (and rx fifo overflow event masked) * and if only tx dma channel is set up (and rx fifo overflow event masked)
* spi master done event irq is not generated unless rx fifo is empty (emptied) * spi host done event irq is not generated unless rx fifo is empty (emptied)
* so we need rx tmp buffer to use for rx dma if user does not provide one * so we need rx tmp buffer to use for rx dma if user does not provide one
*/ */
static int au1550_spi_dma_rxtmp_alloc(struct au1550_spi *hw, unsigned int size) static int au1550_spi_dma_rxtmp_alloc(struct au1550_spi *hw, unsigned int size)
@ -303,7 +303,7 @@ static void au1550_spi_dma_rxtmp_free(struct au1550_spi *hw)
static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t) static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
{ {
struct au1550_spi *hw = spi_master_get_devdata(spi->master); struct au1550_spi *hw = spi_controller_get_devdata(spi->controller);
dma_addr_t dma_tx_addr; dma_addr_t dma_tx_addr;
dma_addr_t dma_rx_addr; dma_addr_t dma_rx_addr;
u32 res; u32 res;
@ -387,7 +387,7 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
hw->regs->psc_spipcr = PSC_SPIPCR_MS; hw->regs->psc_spipcr = PSC_SPIPCR_MS;
wmb(); /* drain writebuffer */ wmb(); /* drain writebuffer */
wait_for_completion(&hw->master_done); wait_for_completion(&hw->host_done);
au1xxx_dbdma_stop(hw->dma_tx_ch); au1xxx_dbdma_stop(hw->dma_tx_ch);
au1xxx_dbdma_stop(hw->dma_rx_ch); au1xxx_dbdma_stop(hw->dma_rx_ch);
@ -449,7 +449,7 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
"dma transfer: unexpected SPI error (event=0x%x stat=0x%x)!\n", "dma transfer: unexpected SPI error (event=0x%x stat=0x%x)!\n",
evnt, stat); evnt, stat);
complete(&hw->master_done); complete(&hw->host_done);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -458,7 +458,7 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
au1550_spi_mask_ack_all(hw); au1550_spi_mask_ack_all(hw);
hw->rx_count = hw->len; hw->rx_count = hw->len;
hw->tx_count = hw->len; hw->tx_count = hw->len;
complete(&hw->master_done); complete(&hw->host_done);
} }
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -502,7 +502,7 @@ AU1550_SPI_TX_WORD(32, 0xffffff)
static int au1550_spi_pio_txrxb(struct spi_device *spi, struct spi_transfer *t) static int au1550_spi_pio_txrxb(struct spi_device *spi, struct spi_transfer *t)
{ {
u32 stat, mask; u32 stat, mask;
struct au1550_spi *hw = spi_master_get_devdata(spi->master); struct au1550_spi *hw = spi_controller_get_devdata(spi->controller);
hw->tx = t->tx_buf; hw->tx = t->tx_buf;
hw->rx = t->rx_buf; hw->rx = t->rx_buf;
@ -537,7 +537,7 @@ static int au1550_spi_pio_txrxb(struct spi_device *spi, struct spi_transfer *t)
hw->regs->psc_spipcr = PSC_SPIPCR_MS; hw->regs->psc_spipcr = PSC_SPIPCR_MS;
wmb(); /* drain writebuffer */ wmb(); /* drain writebuffer */
wait_for_completion(&hw->master_done); wait_for_completion(&hw->host_done);
return min(hw->rx_count, hw->tx_count); return min(hw->rx_count, hw->tx_count);
} }
@ -568,7 +568,7 @@ static irqreturn_t au1550_spi_pio_irq_callback(struct au1550_spi *hw)
dev_err(hw->dev, dev_err(hw->dev,
"pio transfer: unexpected SPI error (event=0x%x stat=0x%x)!\n", "pio transfer: unexpected SPI error (event=0x%x stat=0x%x)!\n",
evnt, stat); evnt, stat);
complete(&hw->master_done); complete(&hw->host_done);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -605,11 +605,11 @@ static irqreturn_t au1550_spi_pio_irq_callback(struct au1550_spi *hw)
/* /*
* Restart the SPI transmission in case of a transmit underflow. * Restart the SPI transmission in case of a transmit underflow.
* This seems to work despite the notes in the Au1550 data book * This seems to work despite the notes in the Au1550 data book
* of Figure 8-4 with flowchart for SPI master operation: * of Figure 8-4 with flowchart for SPI host operation:
* *
* """Note 1: An XFR Error Interrupt occurs, unless masked, * """Note 1: An XFR Error Interrupt occurs, unless masked,
* for any of the following events: Tx FIFO Underflow, * for any of the following events: Tx FIFO Underflow,
* Rx FIFO Overflow, or Multiple-master Error * Rx FIFO Overflow, or Multiple-host Error
* Note 2: In case of a Tx Underflow Error, all zeroes are * Note 2: In case of a Tx Underflow Error, all zeroes are
* transmitted.""" * transmitted."""
* *
@ -627,14 +627,14 @@ static irqreturn_t au1550_spi_pio_irq_callback(struct au1550_spi *hw)
if (hw->rx_count >= hw->len) { if (hw->rx_count >= hw->len) {
/* transfer completed successfully */ /* transfer completed successfully */
au1550_spi_mask_ack_all(hw); au1550_spi_mask_ack_all(hw);
complete(&hw->master_done); complete(&hw->host_done);
} }
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int au1550_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) static int au1550_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
{ {
struct au1550_spi *hw = spi_master_get_devdata(spi->master); struct au1550_spi *hw = spi_controller_get_devdata(spi->controller);
return hw->txrx_bufs(spi, t); return hw->txrx_bufs(spi, t);
} }
@ -723,24 +723,24 @@ static void au1550_spi_setup_psc_as_spi(struct au1550_spi *hw)
static int au1550_spi_probe(struct platform_device *pdev) static int au1550_spi_probe(struct platform_device *pdev)
{ {
struct au1550_spi *hw; struct au1550_spi *hw;
struct spi_master *master; struct spi_controller *host;
struct resource *r; struct resource *r;
int err = 0; int err = 0;
master = spi_alloc_master(&pdev->dev, sizeof(struct au1550_spi)); host = spi_alloc_host(&pdev->dev, sizeof(struct au1550_spi));
if (master == NULL) { if (host == NULL) {
dev_err(&pdev->dev, "No memory for spi_master\n"); dev_err(&pdev->dev, "No memory for spi_controller\n");
err = -ENOMEM; err = -ENOMEM;
goto err_nomem; goto err_nomem;
} }
/* the spi->mode bits understood by this driver: */ /* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST; host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 24); host->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 24);
hw = spi_master_get_devdata(master); hw = spi_controller_get_devdata(host);
hw->master = master; hw->host = host;
hw->pdata = dev_get_platdata(&pdev->dev); hw->pdata = dev_get_platdata(&pdev->dev);
hw->dev = &pdev->dev; hw->dev = &pdev->dev;
@ -798,9 +798,9 @@ static int au1550_spi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, hw); platform_set_drvdata(pdev, hw);
init_completion(&hw->master_done); init_completion(&hw->host_done);
hw->bitbang.master = hw->master; hw->bitbang.master = hw->host;
hw->bitbang.setup_transfer = au1550_spi_setupxfer; hw->bitbang.setup_transfer = au1550_spi_setupxfer;
hw->bitbang.chipselect = au1550_spi_chipsel; hw->bitbang.chipselect = au1550_spi_chipsel;
hw->bitbang.txrx_bufs = au1550_spi_txrx_bufs; hw->bitbang.txrx_bufs = au1550_spi_txrx_bufs;
@ -858,8 +858,8 @@ static int au1550_spi_probe(struct platform_device *pdev)
goto err_no_irq; goto err_no_irq;
} }
master->bus_num = pdev->id; host->bus_num = pdev->id;
master->num_chipselect = hw->pdata->num_chipselect; host->num_chipselect = hw->pdata->num_chipselect;
/* /*
* precompute valid range for spi freq - from au1550 datasheet: * precompute valid range for spi freq - from au1550 datasheet:
@ -874,8 +874,8 @@ static int au1550_spi_probe(struct platform_device *pdev)
int min_div = (2 << 0) * (2 * (4 + 1)); int min_div = (2 << 0) * (2 * (4 + 1));
int max_div = (2 << 3) * (2 * (63 + 1)); int max_div = (2 << 3) * (2 * (63 + 1));
master->max_speed_hz = hw->pdata->mainclk_hz / min_div; host->max_speed_hz = hw->pdata->mainclk_hz / min_div;
master->min_speed_hz = host->min_speed_hz =
hw->pdata->mainclk_hz / (max_div + 1) + 1; hw->pdata->mainclk_hz / (max_div + 1) + 1;
} }
@ -883,13 +883,13 @@ static int au1550_spi_probe(struct platform_device *pdev)
err = spi_bitbang_start(&hw->bitbang); err = spi_bitbang_start(&hw->bitbang);
if (err) { if (err) {
dev_err(&pdev->dev, "Failed to register SPI master\n"); dev_err(&pdev->dev, "Failed to register SPI host\n");
goto err_register; goto err_register;
} }
dev_info(&pdev->dev, dev_info(&pdev->dev,
"spi master registered: bus_num=%d num_chipselect=%d\n", "spi host registered: bus_num=%d num_chipselect=%d\n",
master->bus_num, master->num_chipselect); host->bus_num, host->num_chipselect);
return 0; return 0;
@ -917,7 +917,7 @@ err_ioremap:
err_no_iores: err_no_iores:
err_no_pdata: err_no_pdata:
spi_master_put(hw->master); spi_controller_put(hw->host);
err_nomem: err_nomem:
return err; return err;
@ -927,8 +927,8 @@ static void au1550_spi_remove(struct platform_device *pdev)
{ {
struct au1550_spi *hw = platform_get_drvdata(pdev); struct au1550_spi *hw = platform_get_drvdata(pdev);
dev_info(&pdev->dev, "spi master remove: bus_num=%d\n", dev_info(&pdev->dev, "spi host remove: bus_num=%d\n",
hw->master->bus_num); hw->host->bus_num);
spi_bitbang_stop(&hw->bitbang); spi_bitbang_stop(&hw->bitbang);
free_irq(hw->irq, hw); free_irq(hw->irq, hw);
@ -941,7 +941,7 @@ static void au1550_spi_remove(struct platform_device *pdev)
au1xxx_dbdma_chan_free(hw->dma_tx_ch); au1xxx_dbdma_chan_free(hw->dma_tx_ch);
} }
spi_master_put(hw->master); spi_controller_put(hw->host);
} }
/* work with hotplug and coldplug */ /* work with hotplug and coldplug */