redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

spi: rspi: Merge qspi_send_pio() and qspi_receive_pio() 

qspi_send_pio() and qspi_receive_pio() are very similar: they both send
and receive full duplex data to/from the hardware, but ignore the data
stream in the unused direction.
Merge them into qspi_transfer_out_in(), now supporting real full duplex.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
hifive-unleashed-5.1
Geert Uytterhoeven 2014-01-24 09:43:57 +01:00 committed by Mark Brown
parent 8449fd76de
commit 340a15e6f0
1 changed files with 28 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
drivers/spi/spi-rspi.c
View File

@ -389,28 +389,6 @@ static int rspi_data_out_in(struct rspi_data *rspi, u8 data)
return rspi_data_in(rspi);
}
static int qspi_send_pio(struct rspi_data *rspi, struct spi_transfer *t)
{
int remain = t->len, ret;
const u8 *data = t->tx_buf;
rspi_write8(rspi, SPBFCR_TXRST, QSPI_SPBFCR);
rspi_write8(rspi, 0x00, QSPI_SPBFCR);
while (remain > 0) {
/* dummy read */
ret = rspi_data_out_in(rspi, *data++);
if (ret < 0)
return ret;
remain--;
}
/* Waiting for the last transmission */
rspi_wait_for_interrupt(rspi, SPSR_SPTEF, SPCR_SPTIE);
return 0;
}
static void rspi_dma_complete(void *arg)
{
struct rspi_data *rspi = arg;
@ -550,26 +528,7 @@ static void qspi_receive_init(const struct rspi_data *rspi)
if (spsr & SPSR_SPRF)
rspi_read_data(rspi); /* dummy read */
rspi_write8(rspi, SPBFCR_TXRST | SPBFCR_RXRST, QSPI_SPBFCR);
rspi_write8(rspi, 0x00, QSPI_SPBFCR);
}
static int qspi_receive_pio(struct rspi_data *rspi, struct spi_transfer *t)
{
int remain = t->len, ret;
u8 *data = t->rx_buf;
qspi_receive_init(rspi);
while (remain > 0) {
/* dummy write for generate clock */
ret = rspi_data_out_in(rspi, DUMMY_DATA);
if (ret < 0)
return ret;
*data++ = ret;
remain--;
}
return 0;
rspi_write8(rspi, 0, QSPI_SPBFCR);
}
static int rspi_receive_dma(struct rspi_data *rspi, struct spi_transfer *t)
@ -743,20 +702,38 @@ static int rspi_transfer_one(struct spi_master *master, struct spi_device *spi,
return 0;
}
static int qspi_transfer_out_in(struct rspi_data *rspi,
struct spi_transfer *xfer)
{
int remain = xfer->len, ret;
const u8 *tx_buf = xfer->tx_buf;
u8 *rx_buf = xfer->rx_buf;
u8 data;
qspi_receive_init(rspi);
while (remain > 0) {
data = tx_buf ? *tx_buf++ : DUMMY_DATA;
ret = rspi_data_out_in(rspi, data);
if (ret < 0)
return ret;
if (rx_buf)
*rx_buf++ = ret;
remain--;
}
/* Wait for the last transmission */
rspi_wait_for_interrupt(rspi, SPSR_SPTEF, SPCR_SPTIE);
return 0;
}
static int qspi_transfer_one(struct spi_master *master, struct spi_device *spi,
struct spi_transfer *xfer)
{
struct rspi_data *rspi = spi_master_get_devdata(master);
int ret = 0;
if (xfer->tx_buf) {
ret = qspi_send_pio(rspi, xfer);
if (ret < 0)
return ret;
}
if (xfer->rx_buf)
ret = qspi_receive_pio(rspi, xfer);
return ret;
return qspi_transfer_out_in(rspi, xfer);
}
static int rspi_setup(struct spi_device *spi)