spi/s3c64xx: Use core message handling
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
2cc6e2e0c8
commit
0732a9d2a1
|
@ -879,121 +879,81 @@ static int s3c64xx_spi_prepare_message(struct spi_master *master,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int s3c64xx_spi_transfer_one_message(struct spi_master *master,
|
static int s3c64xx_spi_transfer_one(struct spi_master *master,
|
||||||
struct spi_message *msg)
|
struct spi_device *spi,
|
||||||
|
struct spi_transfer *xfer)
|
||||||
{
|
{
|
||||||
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
|
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
|
||||||
struct spi_device *spi = msg->spi;
|
int status;
|
||||||
struct spi_transfer *xfer;
|
|
||||||
int status = 0, cs_toggle = 0;
|
|
||||||
u32 speed;
|
u32 speed;
|
||||||
u8 bpw;
|
u8 bpw;
|
||||||
|
unsigned long flags;
|
||||||
|
int use_dma;
|
||||||
|
|
||||||
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
|
INIT_COMPLETION(sdd->xfer_completion);
|
||||||
|
|
||||||
unsigned long flags;
|
/* Only BPW and Speed may change across transfers */
|
||||||
int use_dma;
|
bpw = xfer->bits_per_word;
|
||||||
|
speed = xfer->speed_hz ? : spi->max_speed_hz;
|
||||||
|
|
||||||
INIT_COMPLETION(sdd->xfer_completion);
|
if (xfer->len % (bpw / 8)) {
|
||||||
|
dev_err(&spi->dev,
|
||||||
/* Only BPW and Speed may change across transfers */
|
"Xfer length(%u) not a multiple of word size(%u)\n",
|
||||||
bpw = xfer->bits_per_word;
|
xfer->len, bpw / 8);
|
||||||
speed = xfer->speed_hz ? : spi->max_speed_hz;
|
return -EIO;
|
||||||
|
|
||||||
if (xfer->len % (bpw / 8)) {
|
|
||||||
dev_err(&spi->dev,
|
|
||||||
"Xfer length(%u) not a multiple of word size(%u)\n",
|
|
||||||
xfer->len, bpw / 8);
|
|
||||||
status = -EIO;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bpw != sdd->cur_bpw || speed != sdd->cur_speed) {
|
|
||||||
sdd->cur_bpw = bpw;
|
|
||||||
sdd->cur_speed = speed;
|
|
||||||
s3c64xx_spi_config(sdd);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Slave Select */
|
|
||||||
enable_cs(sdd, spi);
|
|
||||||
|
|
||||||
/* Polling method for xfers not bigger than FIFO capacity */
|
|
||||||
use_dma = 0;
|
|
||||||
if (!is_polling(sdd) &&
|
|
||||||
(sdd->rx_dma.ch && sdd->tx_dma.ch &&
|
|
||||||
(xfer->len > ((FIFO_LVL_MASK(sdd) >> 1) + 1))))
|
|
||||||
use_dma = 1;
|
|
||||||
|
|
||||||
spin_lock_irqsave(&sdd->lock, flags);
|
|
||||||
|
|
||||||
/* Pending only which is to be done */
|
|
||||||
sdd->state &= ~RXBUSY;
|
|
||||||
sdd->state &= ~TXBUSY;
|
|
||||||
|
|
||||||
enable_datapath(sdd, spi, xfer, use_dma);
|
|
||||||
|
|
||||||
/* Start the signals */
|
|
||||||
writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
|
|
||||||
|
|
||||||
/* Start the signals */
|
|
||||||
writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
|
|
||||||
|
|
||||||
spin_unlock_irqrestore(&sdd->lock, flags);
|
|
||||||
|
|
||||||
status = wait_for_xfer(sdd, xfer, use_dma);
|
|
||||||
|
|
||||||
if (status) {
|
|
||||||
dev_err(&spi->dev, "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n",
|
|
||||||
xfer->rx_buf ? 1 : 0, xfer->tx_buf ? 1 : 0,
|
|
||||||
(sdd->state & RXBUSY) ? 'f' : 'p',
|
|
||||||
(sdd->state & TXBUSY) ? 'f' : 'p',
|
|
||||||
xfer->len);
|
|
||||||
|
|
||||||
if (use_dma) {
|
|
||||||
if (xfer->tx_buf != NULL
|
|
||||||
&& (sdd->state & TXBUSY))
|
|
||||||
s3c64xx_spi_dma_stop(sdd, &sdd->tx_dma);
|
|
||||||
if (xfer->rx_buf != NULL
|
|
||||||
&& (sdd->state & RXBUSY))
|
|
||||||
s3c64xx_spi_dma_stop(sdd, &sdd->rx_dma);
|
|
||||||
}
|
|
||||||
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
flush_fifo(sdd);
|
|
||||||
|
|
||||||
if (xfer->delay_usecs)
|
|
||||||
udelay(xfer->delay_usecs);
|
|
||||||
|
|
||||||
if (xfer->cs_change) {
|
|
||||||
/* Hint that the next mssg is gonna be
|
|
||||||
for the same device */
|
|
||||||
if (list_is_last(&xfer->transfer_list,
|
|
||||||
&msg->transfers))
|
|
||||||
cs_toggle = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
msg->actual_length += xfer->len;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
if (bpw != sdd->cur_bpw || speed != sdd->cur_speed) {
|
||||||
if (!cs_toggle || status) {
|
sdd->cur_bpw = bpw;
|
||||||
/* Quiese the signals */
|
sdd->cur_speed = speed;
|
||||||
writel(S3C64XX_SPI_SLAVE_SIG_INACT,
|
s3c64xx_spi_config(sdd);
|
||||||
sdd->regs + S3C64XX_SPI_SLAVE_SEL);
|
}
|
||||||
disable_cs(sdd, spi);
|
|
||||||
|
/* Polling method for xfers not bigger than FIFO capacity */
|
||||||
|
use_dma = 0;
|
||||||
|
if (!is_polling(sdd) &&
|
||||||
|
(sdd->rx_dma.ch && sdd->tx_dma.ch &&
|
||||||
|
(xfer->len > ((FIFO_LVL_MASK(sdd) >> 1) + 1))))
|
||||||
|
use_dma = 1;
|
||||||
|
|
||||||
|
spin_lock_irqsave(&sdd->lock, flags);
|
||||||
|
|
||||||
|
/* Pending only which is to be done */
|
||||||
|
sdd->state &= ~RXBUSY;
|
||||||
|
sdd->state &= ~TXBUSY;
|
||||||
|
|
||||||
|
enable_datapath(sdd, spi, xfer, use_dma);
|
||||||
|
|
||||||
|
/* Start the signals */
|
||||||
|
writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
|
||||||
|
|
||||||
|
/* Start the signals */
|
||||||
|
writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
|
||||||
|
|
||||||
|
spin_unlock_irqrestore(&sdd->lock, flags);
|
||||||
|
|
||||||
|
status = wait_for_xfer(sdd, xfer, use_dma);
|
||||||
|
|
||||||
|
if (status) {
|
||||||
|
dev_err(&spi->dev, "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n",
|
||||||
|
xfer->rx_buf ? 1 : 0, xfer->tx_buf ? 1 : 0,
|
||||||
|
(sdd->state & RXBUSY) ? 'f' : 'p',
|
||||||
|
(sdd->state & TXBUSY) ? 'f' : 'p',
|
||||||
|
xfer->len);
|
||||||
|
|
||||||
|
if (use_dma) {
|
||||||
|
if (xfer->tx_buf != NULL
|
||||||
|
&& (sdd->state & TXBUSY))
|
||||||
|
s3c64xx_spi_dma_stop(sdd, &sdd->tx_dma);
|
||||||
|
if (xfer->rx_buf != NULL
|
||||||
|
&& (sdd->state & RXBUSY))
|
||||||
|
s3c64xx_spi_dma_stop(sdd, &sdd->rx_dma);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
sdd->tgl_spi = spi;
|
flush_fifo(sdd);
|
||||||
}
|
}
|
||||||
|
|
||||||
s3c64xx_spi_unmap_mssg(sdd, msg);
|
return status;
|
||||||
|
|
||||||
msg->status = status;
|
|
||||||
|
|
||||||
spi_finalize_current_message(master);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int s3c64xx_spi_unprepare_message(struct spi_master *master,
|
static int s3c64xx_spi_unprepare_message(struct spi_master *master,
|
||||||
|
@ -1379,7 +1339,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
||||||
master->cleanup = s3c64xx_spi_cleanup;
|
master->cleanup = s3c64xx_spi_cleanup;
|
||||||
master->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer;
|
master->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer;
|
||||||
master->prepare_message = s3c64xx_spi_prepare_message;
|
master->prepare_message = s3c64xx_spi_prepare_message;
|
||||||
master->transfer_one_message = s3c64xx_spi_transfer_one_message;
|
master->transfer_one = s3c64xx_spi_transfer_one;
|
||||||
master->unprepare_message = s3c64xx_spi_unprepare_message;
|
master->unprepare_message = s3c64xx_spi_unprepare_message;
|
||||||
master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer;
|
master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer;
|
||||||
master->num_chipselect = sci->num_cs;
|
master->num_chipselect = sci->num_cs;
|
||||||
|
|
Loading…
Reference in New Issue