Skip to content

L
linux
Commit 398b6b31 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files
Options

spi: atmel: switch to use modern name 

Change legacy name master to modern name host or controller.

No functional changed.
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230110131805.2827248-2-yangyingliang@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent be585245
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 127 deletions
drivers/spi/spi-atmel.c
View file @ 398b6b31
...@@ -358,7 +358,7 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi) ...@@ -358,7 +358,7 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi)
u32 csr; u32 csr;
/* Make sure clock polarity is correct */ /* Make sure clock polarity is correct */
for (i = 0; i < spi->master->num_chipselect; i++) { for (i = 0; i < spi->controller->num_chipselect; i++) {
csr = spi_readl(as, CSR0 + 4 * i); csr = spi_readl(as, CSR0 + 4 * i);
if ((csr ^ cpol) & SPI_BIT(CPOL)) if ((csr ^ cpol) & SPI_BIT(CPOL))
spi_writel(as, CSR0 + 4 * i, spi_writel(as, CSR0 + 4 * i,
...@@ -419,11 +419,11 @@ static inline bool atmel_spi_use_dma(struct atmel_spi *as, ...@@ -419,11 +419,11 @@ static inline bool atmel_spi_use_dma(struct atmel_spi *as,
return as->use_dma && xfer->len >= DMA_MIN_BYTES; return as->use_dma && xfer->len >= DMA_MIN_BYTES;
} }
static bool atmel_spi_can_dma(struct spi_master *master, static bool atmel_spi_can_dma(struct spi_controller *host,
struct spi_device *spi, struct spi_device *spi,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
if (IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) if (IS_ENABLED(CONFIG_SOC_SAM_V4_V5))
return atmel_spi_use_dma(as, xfer) && return atmel_spi_use_dma(as, xfer) &&
...@@ -435,7 +435,7 @@ static bool atmel_spi_can_dma(struct spi_master *master, ...@@ -435,7 +435,7 @@ static bool atmel_spi_can_dma(struct spi_master *master,
static int atmel_spi_dma_slave_config(struct atmel_spi *as, u8 bits_per_word) static int atmel_spi_dma_slave_config(struct atmel_spi *as, u8 bits_per_word)
{ {
struct spi_master *master = platform_get_drvdata(as->pdev); struct spi_controller *host = platform_get_drvdata(as->pdev);
struct dma_slave_config slave_config; struct dma_slave_config slave_config;
int err = 0; int err = 0;
...@@ -467,21 +467,21 @@ static int atmel_spi_dma_slave_config(struct atmel_spi *as, u8 bits_per_word) ...@@ -467,21 +467,21 @@ static int atmel_spi_dma_slave_config(struct atmel_spi *as, u8 bits_per_word)
* So we'd rather write only one data at the time. Hence the transmit * So we'd rather write only one data at the time. Hence the transmit
* path works the same whether FIFOs are available (and enabled) or not. * path works the same whether FIFOs are available (and enabled) or not.
*/ */
if (dmaengine_slave_config(master->dma_tx, &slave_config)) { if (dmaengine_slave_config(host->dma_tx, &slave_config)) {
dev_err(&as->pdev->dev, dev_err(&as->pdev->dev,
"failed to configure tx dma channel\n"); "failed to configure tx dma channel\n");
err = -EINVAL; err = -EINVAL;
} }
/* /*
* This driver configures the spi controller for master mode (MSTR bit * This driver configures the spi controller for host mode (MSTR bit
* set to '1' in the Mode Register). * set to '1' in the Mode Register).
* So according to the datasheet, when FIFOs are available (and * So according to the datasheet, when FIFOs are available (and
* enabled), the Receive FIFO operates in Single Data Mode. * enabled), the Receive FIFO operates in Single Data Mode.
* So the receive path works the same whether FIFOs are available (and * So the receive path works the same whether FIFOs are available (and
* enabled) or not. * enabled) or not.
*/ */
if (dmaengine_slave_config(master->dma_rx, &slave_config)) { if (dmaengine_slave_config(host->dma_rx, &slave_config)) {
dev_err(&as->pdev->dev, dev_err(&as->pdev->dev,
"failed to configure rx dma channel\n"); "failed to configure rx dma channel\n");
err = -EINVAL; err = -EINVAL;
...@@ -490,22 +490,22 @@ static int atmel_spi_dma_slave_config(struct atmel_spi *as, u8 bits_per_word) ...@@ -490,22 +490,22 @@ static int atmel_spi_dma_slave_config(struct atmel_spi *as, u8 bits_per_word)
return err; return err;
} }
static int atmel_spi_configure_dma(struct spi_master *master, static int atmel_spi_configure_dma(struct spi_controller *host,
struct atmel_spi *as) struct atmel_spi *as)
{ {
struct device *dev = &as->pdev->dev; struct device *dev = &as->pdev->dev;
int err; int err;
master->dma_tx = dma_request_chan(dev, "tx"); host->dma_tx = dma_request_chan(dev, "tx");
if (IS_ERR(master->dma_tx)) { if (IS_ERR(host->dma_tx)) {
err = PTR_ERR(master->dma_tx); err = PTR_ERR(host->dma_tx);
dev_dbg(dev, "No TX DMA channel, DMA is disabled\n"); dev_dbg(dev, "No TX DMA channel, DMA is disabled\n");
goto error_clear; goto error_clear;
} }
master->dma_rx = dma_request_chan(dev, "rx"); host->dma_rx = dma_request_chan(dev, "rx");
if (IS_ERR(master->dma_rx)) { if (IS_ERR(host->dma_rx)) {
err = PTR_ERR(master->dma_rx); err = PTR_ERR(host->dma_rx);
/* /*
* No reason to check EPROBE_DEFER here since we have already * No reason to check EPROBE_DEFER here since we have already
* requested tx channel. * requested tx channel.
...@@ -520,45 +520,45 @@ static int atmel_spi_configure_dma(struct spi_master *master, ...@@ -520,45 +520,45 @@ static int atmel_spi_configure_dma(struct spi_master *master,
dev_info(&as->pdev->dev, dev_info(&as->pdev->dev,
"Using %s (tx) and %s (rx) for DMA transfers\n", "Using %s (tx) and %s (rx) for DMA transfers\n",
dma_chan_name(master->dma_tx), dma_chan_name(host->dma_tx),
dma_chan_name(master->dma_rx)); dma_chan_name(host->dma_rx));
return 0; return 0;
error: error:
if (!IS_ERR(master->dma_rx)) if (!IS_ERR(host->dma_rx))
dma_release_channel(master->dma_rx); dma_release_channel(host->dma_rx);
if (!IS_ERR(master->dma_tx)) if (!IS_ERR(host->dma_tx))
dma_release_channel(master->dma_tx); dma_release_channel(host->dma_tx);
error_clear: error_clear:
master->dma_tx = master->dma_rx = NULL; host->dma_tx = host->dma_rx = NULL;
return err; return err;
} }
static void atmel_spi_stop_dma(struct spi_master *master) static void atmel_spi_stop_dma(struct spi_controller *host)
{ {
if (master->dma_rx) if (host->dma_rx)
dmaengine_terminate_all(master->dma_rx); dmaengine_terminate_all(host->dma_rx);
if (master->dma_tx) if (host->dma_tx)
dmaengine_terminate_all(master->dma_tx); dmaengine_terminate_all(host->dma_tx);
} }
static void atmel_spi_release_dma(struct spi_master *master) static void atmel_spi_release_dma(struct spi_controller *host)
{ {
if (master->dma_rx) { if (host->dma_rx) {
dma_release_channel(master->dma_rx); dma_release_channel(host->dma_rx);
master->dma_rx = NULL; host->dma_rx = NULL;
} }
if (master->dma_tx) { if (host->dma_tx) {
dma_release_channel(master->dma_tx); dma_release_channel(host->dma_tx);
master->dma_tx = NULL; host->dma_tx = NULL;
} }
} }
/* This function is called by the DMA driver from tasklet context */ /* This function is called by the DMA driver from tasklet context */
static void dma_callback(void *data) static void dma_callback(void *data)
{ {
struct spi_master *master = data; struct spi_controller *host = data;
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
if (is_vmalloc_addr(as->current_transfer->rx_buf) && if (is_vmalloc_addr(as->current_transfer->rx_buf) &&
IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) { IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) {
...@@ -571,13 +571,13 @@ static void dma_callback(void *data) ...@@ -571,13 +571,13 @@ static void dma_callback(void *data)
/* /*
* Next transfer using PIO without FIFO. * Next transfer using PIO without FIFO.
*/ */
static void atmel_spi_next_xfer_single(struct spi_master *master, static void atmel_spi_next_xfer_single(struct spi_controller *host,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
unsigned long xfer_pos = xfer->len - as->current_remaining_bytes; unsigned long xfer_pos = xfer->len - as->current_remaining_bytes;
dev_vdbg(master->dev.parent, "atmel_spi_next_xfer_pio\n"); dev_vdbg(host->dev.parent, "atmel_spi_next_xfer_pio\n");
/* Make sure data is not remaining in RDR */ /* Make sure data is not remaining in RDR */
spi_readl(as, RDR); spi_readl(as, RDR);
...@@ -591,7 +591,7 @@ static void atmel_spi_next_xfer_single(struct spi_master *master, ...@@ -591,7 +591,7 @@ static void atmel_spi_next_xfer_single(struct spi_master *master,
else else
spi_writel(as, TDR, *(u8 *)(xfer->tx_buf + xfer_pos)); spi_writel(as, TDR, *(u8 *)(xfer->tx_buf + xfer_pos));
dev_dbg(master->dev.parent, dev_dbg(host->dev.parent,
" start pio xfer %p: len %u tx %p rx %p bitpw %d\n", " start pio xfer %p: len %u tx %p rx %p bitpw %d\n",
xfer, xfer->len, xfer->tx_buf, xfer->rx_buf, xfer, xfer->len, xfer->tx_buf, xfer->rx_buf,
xfer->bits_per_word); xfer->bits_per_word);
...@@ -603,10 +603,10 @@ static void atmel_spi_next_xfer_single(struct spi_master *master, ...@@ -603,10 +603,10 @@ static void atmel_spi_next_xfer_single(struct spi_master *master,
/* /*
* Next transfer using PIO with FIFO. * Next transfer using PIO with FIFO.
*/ */
static void atmel_spi_next_xfer_fifo(struct spi_master *master, static void atmel_spi_next_xfer_fifo(struct spi_controller *host,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
u32 current_remaining_data, num_data; u32 current_remaining_data, num_data;
u32 offset = xfer->len - as->current_remaining_bytes; u32 offset = xfer->len - as->current_remaining_bytes;
const u16 *words = (const u16 *)((u8 *)xfer->tx_buf + offset); const u16 *words = (const u16 *)((u8 *)xfer->tx_buf + offset);
...@@ -614,7 +614,7 @@ static void atmel_spi_next_xfer_fifo(struct spi_master *master, ...@@ -614,7 +614,7 @@ static void atmel_spi_next_xfer_fifo(struct spi_master *master,
u16 td0, td1; u16 td0, td1;
u32 fifomr; u32 fifomr;
dev_vdbg(master->dev.parent, "atmel_spi_next_xfer_fifo\n"); dev_vdbg(host->dev.parent, "atmel_spi_next_xfer_fifo\n");
/* Compute the number of data to transfer in the current iteration */ /* Compute the number of data to transfer in the current iteration */
current_remaining_data = ((xfer->bits_per_word > 8) ? current_remaining_data = ((xfer->bits_per_word > 8) ?
...@@ -658,7 +658,7 @@ static void atmel_spi_next_xfer_fifo(struct spi_master *master, ...@@ -658,7 +658,7 @@ static void atmel_spi_next_xfer_fifo(struct spi_master *master,
num_data--; num_data--;
} }
dev_dbg(master->dev.parent, dev_dbg(host->dev.parent,
" start fifo xfer %p: len %u tx %p rx %p bitpw %d\n", " start fifo xfer %p: len %u tx %p rx %p bitpw %d\n",
xfer, xfer->len, xfer->tx_buf, xfer->rx_buf, xfer, xfer->len, xfer->tx_buf, xfer->rx_buf,
xfer->bits_per_word); xfer->bits_per_word);
...@@ -673,32 +673,32 @@ static void atmel_spi_next_xfer_fifo(struct spi_master *master, ...@@ -673,32 +673,32 @@ static void atmel_spi_next_xfer_fifo(struct spi_master *master,
/* /*
* Next transfer using PIO. * Next transfer using PIO.
*/ */
static void atmel_spi_next_xfer_pio(struct spi_master *master, static void atmel_spi_next_xfer_pio(struct spi_controller *host,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
if (as->fifo_size) if (as->fifo_size)
atmel_spi_next_xfer_fifo(master, xfer); atmel_spi_next_xfer_fifo(host, xfer);
else else
atmel_spi_next_xfer_single(master, xfer); atmel_spi_next_xfer_single(host, xfer);
} }
/* /*
* Submit next transfer for DMA. * Submit next transfer for DMA.
*/ */
static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, static int atmel_spi_next_xfer_dma_submit(struct spi_controller *host,
struct spi_transfer *xfer, struct spi_transfer *xfer,
u32 *plen) u32 *plen)
{ {
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
struct dma_chan *rxchan = master->dma_rx; struct dma_chan *rxchan = host->dma_rx;
struct dma_chan *txchan = master->dma_tx; struct dma_chan *txchan = host->dma_tx;
struct dma_async_tx_descriptor *rxdesc; struct dma_async_tx_descriptor *rxdesc;
struct dma_async_tx_descriptor *txdesc; struct dma_async_tx_descriptor *txdesc;
dma_cookie_t cookie; dma_cookie_t cookie;
dev_vdbg(master->dev.parent, "atmel_spi_next_xfer_dma_submit\n"); dev_vdbg(host->dev.parent, "atmel_spi_next_xfer_dma_submit\n");
/* Check that the channels are available */ /* Check that the channels are available */
if (!rxchan || !txchan) if (!rxchan || !txchan)
...@@ -749,7 +749,7 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, ...@@ -749,7 +749,7 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
if (!txdesc) if (!txdesc)
goto err_dma; goto err_dma;
dev_dbg(master->dev.parent, dev_dbg(host->dev.parent,
" start dma xfer %p: len %u tx %p/%08llx rx %p/%08llx\n", " start dma xfer %p: len %u tx %p/%08llx rx %p/%08llx\n",
xfer, xfer->len, xfer->tx_buf, (unsigned long long)xfer->tx_dma, xfer, xfer->len, xfer->tx_buf, (unsigned long long)xfer->tx_dma,
xfer->rx_buf, (unsigned long long)xfer->rx_dma); xfer->rx_buf, (unsigned long long)xfer->rx_dma);
...@@ -759,7 +759,7 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, ...@@ -759,7 +759,7 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
/* Put the callback on the RX transfer only, that should finish last */ /* Put the callback on the RX transfer only, that should finish last */
rxdesc->callback = dma_callback; rxdesc->callback = dma_callback;
rxdesc->callback_param = master; rxdesc->callback_param = host;
/* Submit and fire RX and TX with TX last so we're ready to read! */ /* Submit and fire RX and TX with TX last so we're ready to read! */
cookie = rxdesc->tx_submit(rxdesc); cookie = rxdesc->tx_submit(rxdesc);
...@@ -775,12 +775,12 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, ...@@ -775,12 +775,12 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
err_dma: err_dma:
spi_writel(as, IDR, SPI_BIT(OVRES)); spi_writel(as, IDR, SPI_BIT(OVRES));
atmel_spi_stop_dma(master); atmel_spi_stop_dma(host);
err_exit: err_exit:
return -ENOMEM; return -ENOMEM;
} }
static void atmel_spi_next_xfer_data(struct spi_master *master, static void atmel_spi_next_xfer_data(struct spi_controller *host,
struct spi_transfer *xfer, struct spi_transfer *xfer,
dma_addr_t *tx_dma, dma_addr_t *tx_dma,
dma_addr_t *rx_dma, dma_addr_t *rx_dma,
...@@ -788,8 +788,8 @@ static void atmel_spi_next_xfer_data(struct spi_master *master, ...@@ -788,8 +788,8 @@ static void atmel_spi_next_xfer_data(struct spi_master *master,
{ {
*rx_dma = xfer->rx_dma + xfer->len - *plen; *rx_dma = xfer->rx_dma + xfer->len - *plen;
*tx_dma = xfer->tx_dma + xfer->len - *plen; *tx_dma = xfer->tx_dma + xfer->len - *plen;
if (*plen > master->max_dma_len) if (*plen > host->max_dma_len)
*plen = master->max_dma_len; *plen = host->max_dma_len;
} }
static int atmel_spi_set_xfer_speed(struct atmel_spi *as, static int atmel_spi_set_xfer_speed(struct atmel_spi *as,
...@@ -844,17 +844,17 @@ static int atmel_spi_set_xfer_speed(struct atmel_spi *as, ...@@ -844,17 +844,17 @@ static int atmel_spi_set_xfer_speed(struct atmel_spi *as,
* Submit next transfer for PDC. * Submit next transfer for PDC.
* lock is held, spi irq is blocked * lock is held, spi irq is blocked
*/ */
static void atmel_spi_pdc_next_xfer(struct spi_master *master, static void atmel_spi_pdc_next_xfer(struct spi_controller *host,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
u32 len; u32 len;
dma_addr_t tx_dma, rx_dma; dma_addr_t tx_dma, rx_dma;
spi_writel(as, PTCR, SPI_BIT(RXTDIS) | SPI_BIT(TXTDIS)); spi_writel(as, PTCR, SPI_BIT(RXTDIS) | SPI_BIT(TXTDIS));
len = as->current_remaining_bytes; len = as->current_remaining_bytes;
atmel_spi_next_xfer_data(master, xfer, &tx_dma, &rx_dma, &len); atmel_spi_next_xfer_data(host, xfer, &tx_dma, &rx_dma, &len);
as->current_remaining_bytes -= len; as->current_remaining_bytes -= len;
spi_writel(as, RPR, rx_dma); spi_writel(as, RPR, rx_dma);
...@@ -865,7 +865,7 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master, ...@@ -865,7 +865,7 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master,
spi_writel(as, RCR, len); spi_writel(as, RCR, len);
spi_writel(as, TCR, len); spi_writel(as, TCR, len);
dev_dbg(&master->dev, dev_dbg(&host->dev,
" start xfer %p: len %u tx %p/%08llx rx %p/%08llx\n", " start xfer %p: len %u tx %p/%08llx rx %p/%08llx\n",
xfer, xfer->len, xfer->tx_buf, xfer, xfer->len, xfer->tx_buf,
(unsigned long long)xfer->tx_dma, xfer->rx_buf, (unsigned long long)xfer->tx_dma, xfer->rx_buf,
...@@ -873,7 +873,7 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master, ...@@ -873,7 +873,7 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master,
if (as->current_remaining_bytes) { if (as->current_remaining_bytes) {
len = as->current_remaining_bytes; len = as->current_remaining_bytes;
atmel_spi_next_xfer_data(master, xfer, &tx_dma, &rx_dma, &len); atmel_spi_next_xfer_data(host, xfer, &tx_dma, &rx_dma, &len);
as->current_remaining_bytes -= len; as->current_remaining_bytes -= len;
spi_writel(as, RNPR, rx_dma); spi_writel(as, RNPR, rx_dma);
...@@ -884,7 +884,7 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master, ...@@ -884,7 +884,7 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master,
spi_writel(as, RNCR, len); spi_writel(as, RNCR, len);
spi_writel(as, TNCR, len); spi_writel(as, TNCR, len);
dev_dbg(&master->dev, dev_dbg(&host->dev,
" next xfer %p: len %u tx %p/%08llx rx %p/%08llx\n", " next xfer %p: len %u tx %p/%08llx rx %p/%08llx\n",
xfer, xfer->len, xfer->tx_buf, xfer, xfer->len, xfer->tx_buf,
(unsigned long long)xfer->tx_dma, xfer->rx_buf, (unsigned long long)xfer->tx_dma, xfer->rx_buf,
...@@ -944,14 +944,14 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer) ...@@ -944,14 +944,14 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
return 0; return 0;
} }
static void atmel_spi_dma_unmap_xfer(struct spi_master *master, static void atmel_spi_dma_unmap_xfer(struct spi_controller *host,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
if (xfer->tx_dma != INVALID_DMA_ADDRESS) if (xfer->tx_dma != INVALID_DMA_ADDRESS)
dma_unmap_single(master->dev.parent, xfer->tx_dma, dma_unmap_single(host->dev.parent, xfer->tx_dma,
xfer->len, DMA_TO_DEVICE); xfer->len, DMA_TO_DEVICE);
if (xfer->rx_dma != INVALID_DMA_ADDRESS) if (xfer->rx_dma != INVALID_DMA_ADDRESS)
dma_unmap_single(master->dev.parent, xfer->rx_dma, dma_unmap_single(host->dev.parent, xfer->rx_dma,
xfer->len, DMA_FROM_DEVICE); xfer->len, DMA_FROM_DEVICE);
} }
...@@ -1039,8 +1039,8 @@ atmel_spi_pump_pio_data(struct atmel_spi *as, struct spi_transfer *xfer) ...@@ -1039,8 +1039,8 @@ atmel_spi_pump_pio_data(struct atmel_spi *as, struct spi_transfer *xfer)
static irqreturn_t static irqreturn_t
atmel_spi_pio_interrupt(int irq, void *dev_id) atmel_spi_pio_interrupt(int irq, void *dev_id)
{ {
struct spi_master *master = dev_id; struct spi_controller *host = dev_id;
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
u32 status, pending, imr; u32 status, pending, imr;
struct spi_transfer *xfer; struct spi_transfer *xfer;
int ret = IRQ_NONE; int ret = IRQ_NONE;
...@@ -1052,7 +1052,7 @@ atmel_spi_pio_interrupt(int irq, void *dev_id) ...@@ -1052,7 +1052,7 @@ atmel_spi_pio_interrupt(int irq, void *dev_id)
if (pending & SPI_BIT(OVRES)) { if (pending & SPI_BIT(OVRES)) {
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
spi_writel(as, IDR, SPI_BIT(OVRES)); spi_writel(as, IDR, SPI_BIT(OVRES));
dev_warn(master->dev.parent, "overrun\n"); dev_warn(host->dev.parent, "overrun\n");
/* /*
* When we get an overrun, we disregard the current * When we get an overrun, we disregard the current
...@@ -1097,8 +1097,8 @@ atmel_spi_pio_interrupt(int irq, void *dev_id) ...@@ -1097,8 +1097,8 @@ atmel_spi_pio_interrupt(int irq, void *dev_id)
static irqreturn_t static irqreturn_t
atmel_spi_pdc_interrupt(int irq, void *dev_id) atmel_spi_pdc_interrupt(int irq, void *dev_id)
{ {
struct spi_master *master = dev_id; struct spi_controller *host = dev_id;
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
u32 status, pending, imr; u32 status, pending, imr;
int ret = IRQ_NONE; int ret = IRQ_NONE;
...@@ -1152,12 +1152,12 @@ static int atmel_word_delay_csr(struct spi_device *spi, struct atmel_spi *as) ...@@ -1152,12 +1152,12 @@ static int atmel_word_delay_csr(struct spi_device *spi, struct atmel_spi *as)
static void initialize_native_cs_for_gpio(struct atmel_spi *as) static void initialize_native_cs_for_gpio(struct atmel_spi *as)
{ {
int i; int i;
struct spi_master *master = platform_get_drvdata(as->pdev); struct spi_controller *host = platform_get_drvdata(as->pdev);
if (!as->native_cs_free) if (!as->native_cs_free)
return; /* already initialized */ return; /* already initialized */
if (!master->cs_gpiods) if (!host->cs_gpiods)
return; /* No CS GPIO */ return; /* No CS GPIO */
/* /*
...@@ -1170,7 +1170,7 @@ static void initialize_native_cs_for_gpio(struct atmel_spi *as) ...@@ -1170,7 +1170,7 @@ static void initialize_native_cs_for_gpio(struct atmel_spi *as)
i = 1; i = 1;
for (; i < 4; i++) for (; i < 4; i++)
if (master->cs_gpiods[i]) if (host->cs_gpiods[i])
as->native_cs_free |= BIT(i); as->native_cs_free |= BIT(i);
if (as->native_cs_free) if (as->native_cs_free)
...@@ -1186,7 +1186,7 @@ static int atmel_spi_setup(struct spi_device *spi) ...@@ -1186,7 +1186,7 @@ static int atmel_spi_setup(struct spi_device *spi)
int chip_select; int chip_select;
int word_delay_csr; int word_delay_csr;
as = spi_master_get_devdata(spi->master); as = spi_controller_get_devdata(spi->controller);
/* see notes above re chipselect */ /* see notes above re chipselect */
if (!spi->cs_gpiod && (spi->mode & SPI_CS_HIGH)) { if (!spi->cs_gpiod && (spi->mode & SPI_CS_HIGH)) {
...@@ -1254,7 +1254,7 @@ static int atmel_spi_setup(struct spi_device *spi) ...@@ -1254,7 +1254,7 @@ static int atmel_spi_setup(struct spi_device *spi)
static void atmel_spi_set_cs(struct spi_device *spi, bool enable) static void atmel_spi_set_cs(struct spi_device *spi, bool enable)
{ {
struct atmel_spi *as = spi_master_get_devdata(spi->master); struct atmel_spi *as = spi_controller_get_devdata(spi->controller);
/* the core doesn't really pass us enable/disable, but CS HIGH vs CS LOW /* the core doesn't really pass us enable/disable, but CS HIGH vs CS LOW
* since we already have routines for activate/deactivate translate * since we already have routines for activate/deactivate translate
* high/low to active/inactive * high/low to active/inactive
...@@ -1269,7 +1269,7 @@ static void atmel_spi_set_cs(struct spi_device *spi, bool enable) ...@@ -1269,7 +1269,7 @@ static void atmel_spi_set_cs(struct spi_device *spi, bool enable)
} }
static int atmel_spi_one_transfer(struct spi_master *master, static int atmel_spi_one_transfer(struct spi_controller *host,
struct spi_device *spi, struct spi_device *spi,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
...@@ -1281,7 +1281,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1281,7 +1281,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
int ret; int ret;
unsigned long dma_timeout; unsigned long dma_timeout;
as = spi_master_get_devdata(master); as = spi_controller_get_devdata(host);
asd = spi->controller_state; asd = spi->controller_state;
bits = (asd->csr >> 4) & 0xf; bits = (asd->csr >> 4) & 0xf;
...@@ -1295,7 +1295,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1295,7 +1295,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
* DMA map early, for performance (empties dcache ASAP) and * DMA map early, for performance (empties dcache ASAP) and
* better fault reporting. * better fault reporting.
*/ */
if ((!master->cur_msg->is_dma_mapped) if ((!host->cur_msg->is_dma_mapped)
&& as->use_pdc) { && as->use_pdc) {
if (atmel_spi_dma_map_xfer(as, xfer) < 0) if (atmel_spi_dma_map_xfer(as, xfer) < 0)
return -ENOMEM; return -ENOMEM;
...@@ -1311,11 +1311,11 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1311,11 +1311,11 @@ static int atmel_spi_one_transfer(struct spi_master *master,
if (as->use_pdc) { if (as->use_pdc) {
atmel_spi_lock(as); atmel_spi_lock(as);
atmel_spi_pdc_next_xfer(master, xfer); atmel_spi_pdc_next_xfer(host, xfer);
atmel_spi_unlock(as); atmel_spi_unlock(as);
} else if (atmel_spi_use_dma(as, xfer)) { } else if (atmel_spi_use_dma(as, xfer)) {
len = as->current_remaining_bytes; len = as->current_remaining_bytes;
ret = atmel_spi_next_xfer_dma_submit(master, ret = atmel_spi_next_xfer_dma_submit(host,
xfer, &len); xfer, &len);
if (ret) { if (ret) {
dev_err(&spi->dev, dev_err(&spi->dev,
...@@ -1329,7 +1329,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1329,7 +1329,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
} }
} else { } else {
atmel_spi_lock(as); atmel_spi_lock(as);
atmel_spi_next_xfer_pio(master, xfer); atmel_spi_next_xfer_pio(host, xfer);
atmel_spi_unlock(as); atmel_spi_unlock(as);
} }
...@@ -1346,7 +1346,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1346,7 +1346,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
if (as->done_status) { if (as->done_status) {
if (as->use_pdc) { if (as->use_pdc) {
dev_warn(master->dev.parent, dev_warn(host->dev.parent,
"overrun (%u/%u remaining)\n", "overrun (%u/%u remaining)\n",
spi_readl(as, TCR), spi_readl(as, RCR)); spi_readl(as, TCR), spi_readl(as, RCR));
...@@ -1362,7 +1362,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1362,7 +1362,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
if (spi_readl(as, SR) & SPI_BIT(TXEMPTY)) if (spi_readl(as, SR) & SPI_BIT(TXEMPTY))
break; break;
if (!timeout) if (!timeout)
dev_warn(master->dev.parent, dev_warn(host->dev.parent,
"timeout waiting for TXEMPTY"); "timeout waiting for TXEMPTY");
while (spi_readl(as, SR) & SPI_BIT(RDRF)) while (spi_readl(as, SR) & SPI_BIT(RDRF))
spi_readl(as, RDR); spi_readl(as, RDR);
...@@ -1371,13 +1371,13 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1371,13 +1371,13 @@ static int atmel_spi_one_transfer(struct spi_master *master,
spi_readl(as, SR); spi_readl(as, SR);
} else if (atmel_spi_use_dma(as, xfer)) { } else if (atmel_spi_use_dma(as, xfer)) {
atmel_spi_stop_dma(master); atmel_spi_stop_dma(host);
} }
} }
if (!master->cur_msg->is_dma_mapped if (!host->cur_msg->is_dma_mapped
&& as->use_pdc) && as->use_pdc)
atmel_spi_dma_unmap_xfer(master, xfer); atmel_spi_dma_unmap_xfer(host, xfer);
if (as->use_pdc) if (as->use_pdc)
atmel_spi_disable_pdc_transfer(as); atmel_spi_disable_pdc_transfer(as);
...@@ -1440,7 +1440,7 @@ static int atmel_spi_probe(struct platform_device *pdev) ...@@ -1440,7 +1440,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
int irq; int irq;
struct clk *clk; struct clk *clk;
int ret; int ret;
struct spi_master *master; struct spi_controller *host;
struct atmel_spi *as; struct atmel_spi *as;
/* Select default pin state */ /* Select default pin state */
...@@ -1459,29 +1459,29 @@ static int atmel_spi_probe(struct platform_device *pdev) ...@@ -1459,29 +1459,29 @@ static int atmel_spi_probe(struct platform_device *pdev)
return PTR_ERR(clk); return PTR_ERR(clk);
/* setup spi core then atmel-specific driver state */ /* setup spi core then atmel-specific driver state */
master = spi_alloc_master(&pdev->dev, sizeof(*as)); host = spi_alloc_host(&pdev->dev, sizeof(*as));
if (!master) if (!host)
return -ENOMEM; return -ENOMEM;
/* the spi->mode bits understood by this driver: */ /* the spi->mode bits understood by this driver: */
master->use_gpio_descriptors = true; host->use_gpio_descriptors = true;
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16); host->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16);
master->dev.of_node = pdev->dev.of_node; host->dev.of_node = pdev->dev.of_node;
master->bus_num = pdev->id; host->bus_num = pdev->id;
master->num_chipselect = 4; host->num_chipselect = 4;
master->setup = atmel_spi_setup; host->setup = atmel_spi_setup;
master->flags = (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX | host->flags = (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX |
SPI_MASTER_GPIO_SS); SPI_MASTER_GPIO_SS);
master->transfer_one = atmel_spi_one_transfer; host->transfer_one = atmel_spi_one_transfer;
master->set_cs = atmel_spi_set_cs; host->set_cs = atmel_spi_set_cs;
master->cleanup = atmel_spi_cleanup; host->cleanup = atmel_spi_cleanup;
master->auto_runtime_pm = true; host->auto_runtime_pm = true;
master->max_dma_len = SPI_MAX_DMA_XFER; host->max_dma_len = SPI_MAX_DMA_XFER;
master->can_dma = atmel_spi_can_dma; host->can_dma = atmel_spi_can_dma;
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, host);
as = spi_master_get_devdata(master); as = spi_controller_get_devdata(host);
spin_lock_init(&as->lock); spin_lock_init(&as->lock);
...@@ -1502,7 +1502,7 @@ static int atmel_spi_probe(struct platform_device *pdev) ...@@ -1502,7 +1502,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
as->use_dma = false; as->use_dma = false;
as->use_pdc = false; as->use_pdc = false;
if (as->caps.has_dma_support) { if (as->caps.has_dma_support) {
ret = atmel_spi_configure_dma(master, as); ret = atmel_spi_configure_dma(host, as);
if (ret == 0) { if (ret == 0) {
as->use_dma = true; as->use_dma = true;
} else if (ret == -EPROBE_DEFER) { } else if (ret == -EPROBE_DEFER) {
...@@ -1532,7 +1532,7 @@ static int atmel_spi_probe(struct platform_device *pdev) ...@@ -1532,7 +1532,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
} }
} }
if (!as->use_dma) if (!as->use_dma)
dev_info(master->dev.parent, dev_info(host->dev.parent,
" can not allocate dma coherent memory\n"); " can not allocate dma coherent memory\n");
} }
...@@ -1541,10 +1541,10 @@ static int atmel_spi_probe(struct platform_device *pdev) ...@@ -1541,10 +1541,10 @@ static int atmel_spi_probe(struct platform_device *pdev)
if (as->use_pdc) { if (as->use_pdc) {
ret = devm_request_irq(&pdev->dev, irq, atmel_spi_pdc_interrupt, ret = devm_request_irq(&pdev->dev, irq, atmel_spi_pdc_interrupt,
0, dev_name(&pdev->dev), master); 0, dev_name(&pdev->dev), host);
} else { } else {
ret = devm_request_irq(&pdev->dev, irq, atmel_spi_pio_interrupt, ret = devm_request_irq(&pdev->dev, irq, atmel_spi_pio_interrupt,
0, dev_name(&pdev->dev), master); 0, dev_name(&pdev->dev), host);
} }
if (ret) if (ret)
goto out_unmap_regs; goto out_unmap_regs;
...@@ -1569,7 +1569,7 @@ static int atmel_spi_probe(struct platform_device *pdev) ...@@ -1569,7 +1569,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
pm_runtime_set_active(&pdev->dev); pm_runtime_set_active(&pdev->dev);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
ret = devm_spi_register_master(&pdev->dev, master); ret = devm_spi_register_controller(&pdev->dev, host);
if (ret) if (ret)
goto out_free_dma; goto out_free_dma;
...@@ -1585,28 +1585,28 @@ static int atmel_spi_probe(struct platform_device *pdev) ...@@ -1585,28 +1585,28 @@ static int atmel_spi_probe(struct platform_device *pdev)
pm_runtime_set_suspended(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);
if (as->use_dma) if (as->use_dma)
atmel_spi_release_dma(master); atmel_spi_release_dma(host);
spi_writel(as, CR, SPI_BIT(SWRST)); spi_writel(as, CR, SPI_BIT(SWRST));
spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
out_free_irq: out_free_irq:
out_unmap_regs: out_unmap_regs:
spi_master_put(master); spi_controller_put(host);
return ret; return ret;
} }
static int atmel_spi_remove(struct platform_device *pdev) static int atmel_spi_remove(struct platform_device *pdev)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_controller *host = platform_get_drvdata(pdev);
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
pm_runtime_get_sync(&pdev->dev); pm_runtime_get_sync(&pdev->dev);
/* reset the hardware and block queue progress */ /* reset the hardware and block queue progress */
if (as->use_dma) { if (as->use_dma) {
atmel_spi_stop_dma(master); atmel_spi_stop_dma(host);
atmel_spi_release_dma(master); atmel_spi_release_dma(host);
if (IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) { if (IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) {
dma_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER, dma_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER,
as->addr_tx_bbuf, as->addr_tx_bbuf,
...@@ -1633,8 +1633,8 @@ static int atmel_spi_remove(struct platform_device *pdev) ...@@ -1633,8 +1633,8 @@ static int atmel_spi_remove(struct platform_device *pdev)
static int atmel_spi_runtime_suspend(struct device *dev) static int atmel_spi_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
clk_disable_unprepare(as->clk); clk_disable_unprepare(as->clk);
pinctrl_pm_select_sleep_state(dev); pinctrl_pm_select_sleep_state(dev);
...@@ -1644,8 +1644,8 @@ static int atmel_spi_runtime_suspend(struct device *dev) ...@@ -1644,8 +1644,8 @@ static int atmel_spi_runtime_suspend(struct device *dev)
static int atmel_spi_runtime_resume(struct device *dev) static int atmel_spi_runtime_resume(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
pinctrl_pm_select_default_state(dev); pinctrl_pm_select_default_state(dev);
...@@ -1654,11 +1654,11 @@ static int atmel_spi_runtime_resume(struct device *dev) ...@@ -1654,11 +1654,11 @@ static int atmel_spi_runtime_resume(struct device *dev)
static int atmel_spi_suspend(struct device *dev) static int atmel_spi_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
int ret; int ret;
/* Stop the queue running */ /* Stop the queue running */
ret = spi_master_suspend(master); ret = spi_controller_suspend(host);
if (ret) if (ret)
return ret; return ret;
...@@ -1670,8 +1670,8 @@ static int atmel_spi_suspend(struct device *dev) ...@@ -1670,8 +1670,8 @@ static int atmel_spi_suspend(struct device *dev)
static int atmel_spi_resume(struct device *dev) static int atmel_spi_resume(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_controller_get_devdata(host);
int ret; int ret;
ret = clk_prepare_enable(as->clk); ret = clk_prepare_enable(as->clk);
...@@ -1689,7 +1689,7 @@ static int atmel_spi_resume(struct device *dev) ...@@ -1689,7 +1689,7 @@ static int atmel_spi_resume(struct device *dev)
} }
/* Start the queue running */ /* Start the queue running */
return spi_master_resume(master); return spi_controller_resume(host);
} }
static const struct dev_pm_ops atmel_spi_pm_ops = { static const struct dev_pm_ops atmel_spi_pm_ops = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7