nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

spi: omap2-mcspi: Switch driver to use transfer_one

Browse source 
Switches from transfer_one_message to transfer_one to prepare driver for
use of GPIO chip selects.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Michael Welling 2015-05-07 18:36:53 -05:00 committed by Mark Brown
parent 7d76980242
commit b28cb9414d
1 changed files with 122 additions and 146 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

268
drivers/spi/spi-omap2-mcspi.c
View file

@ -1052,7 +1052,8 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
} }
} }
static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m) static int omap2_mcspi_work_one(struct omap2_mcspi *mcspi,
struct spi_device *spi, struct spi_transfer *t)
{ {
/* We only enable one channel at a time -- the one whose message is /* We only enable one channel at a time -- the one whose message is
@ -1062,8 +1063,6 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m)
* chipselect with the FORCE bit ... CS != channel enable. * chipselect with the FORCE bit ... CS != channel enable.
*/ */
struct spi_device *spi;
struct spi_transfer *t = NULL;
struct spi_master *master; struct spi_master *master;
struct omap2_mcspi_dma *mcspi_dma; struct omap2_mcspi_dma *mcspi_dma;
int cs_active = 0; int cs_active = 0;
@ -1073,7 +1072,6 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m)
int status = 0; int status = 0;
u32 chconf; u32 chconf;
spi = m->spi;
master = spi->master; master = spi->master;
mcspi_dma = mcspi->dma_channels + spi->chip_select; mcspi_dma = mcspi->dma_channels + spi->chip_select;
cs = spi->controller_state; cs = spi->controller_state;
@ -1090,94 +1088,89 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m)
par_override = 1; par_override = 1;
omap2_mcspi_set_enable(spi, 0); omap2_mcspi_set_enable(spi, 0);
list_for_each_entry(t, &m->transfers, transfer_list) {
if (t->tx_buf == NULL && t->rx_buf == NULL && t->len) {
status = -EINVAL;
break;
}
if (par_override ||
(t->speed_hz != spi->max_speed_hz) ||
(t->bits_per_word != spi->bits_per_word)) {
par_override = 1;
status = omap2_mcspi_setup_transfer(spi, t);
if (status < 0)
break;
if (t->speed_hz == spi->max_speed_hz &&
t->bits_per_word == spi->bits_per_word)
par_override = 0;
}
if (cd && cd->cs_per_word) {
chconf = mcspi->ctx.modulctrl;
chconf &= ~OMAP2_MCSPI_MODULCTRL_SINGLE;
mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, chconf);
mcspi->ctx.modulctrl =
mcspi_read_cs_reg(spi, OMAP2_MCSPI_MODULCTRL);
}
if (par_override ||
if (!cs_active) { (t->speed_hz != spi->max_speed_hz) ||
omap2_mcspi_force_cs(spi, 1); (t->bits_per_word != spi->bits_per_word)) {
cs_active = 1; par_override = 1;
} status = omap2_mcspi_setup_transfer(spi, t);
if (status < 0)
chconf = mcspi_cached_chconf0(spi); goto out;
chconf &= ~OMAP2_MCSPI_CHCONF_TRM_MASK; if (t->speed_hz == spi->max_speed_hz &&
chconf &= ~OMAP2_MCSPI_CHCONF_TURBO; t->bits_per_word == spi->bits_per_word)
par_override = 0;
if (t->tx_buf == NULL)
chconf |= OMAP2_MCSPI_CHCONF_TRM_RX_ONLY;
else if (t->rx_buf == NULL)
chconf |= OMAP2_MCSPI_CHCONF_TRM_TX_ONLY;
if (cd && cd->turbo_mode && t->tx_buf == NULL) {
/* Turbo mode is for more than one word */
if (t->len > ((cs->word_len + 7) >> 3))
chconf |= OMAP2_MCSPI_CHCONF_TURBO;
}
mcspi_write_chconf0(spi, chconf);
if (t->len) {
unsigned count;
if ((mcspi_dma->dma_rx && mcspi_dma->dma_tx) &&
(m->is_dma_mapped || t->len >= DMA_MIN_BYTES))
omap2_mcspi_set_fifo(spi, t, 1);
omap2_mcspi_set_enable(spi, 1);
/* RX_ONLY mode needs dummy data in TX reg */
if (t->tx_buf == NULL)
writel_relaxed(0, cs->base
+ OMAP2_MCSPI_TX0);
if ((mcspi_dma->dma_rx && mcspi_dma->dma_tx) &&
(m->is_dma_mapped || t->len >= DMA_MIN_BYTES))
count = omap2_mcspi_txrx_dma(spi, t);
else
count = omap2_mcspi_txrx_pio(spi, t);
m->actual_length += count;
if (count != t->len) {
status = -EIO;
break;
}
}
if (t->delay_usecs)
udelay(t->delay_usecs);
/* ignore the "leave it on after last xfer" hint */
if (t->cs_change) {
omap2_mcspi_force_cs(spi, 0);
cs_active = 0;
}
omap2_mcspi_set_enable(spi, 0);
if (mcspi->fifo_depth > 0)
omap2_mcspi_set_fifo(spi, t, 0);
} }
if (cd && cd->cs_per_word) {
chconf = mcspi->ctx.modulctrl;
chconf &= ~OMAP2_MCSPI_MODULCTRL_SINGLE;
mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, chconf);
mcspi->ctx.modulctrl =
mcspi_read_cs_reg(spi, OMAP2_MCSPI_MODULCTRL);
}
if (!cs_active) {
omap2_mcspi_force_cs(spi, 1);
cs_active = 1;
}
chconf = mcspi_cached_chconf0(spi);
chconf &= ~OMAP2_MCSPI_CHCONF_TRM_MASK;
chconf &= ~OMAP2_MCSPI_CHCONF_TURBO;
if (t->tx_buf == NULL)
chconf |= OMAP2_MCSPI_CHCONF_TRM_RX_ONLY;
else if (t->rx_buf == NULL)
chconf |= OMAP2_MCSPI_CHCONF_TRM_TX_ONLY;
if (cd && cd->turbo_mode && t->tx_buf == NULL) {
/* Turbo mode is for more than one word */
if (t->len > ((cs->word_len + 7) >> 3))
chconf |= OMAP2_MCSPI_CHCONF_TURBO;
}
mcspi_write_chconf0(spi, chconf);
if (t->len) {
unsigned count;
if ((mcspi_dma->dma_rx && mcspi_dma->dma_tx) &&
(t->len >= DMA_MIN_BYTES))
omap2_mcspi_set_fifo(spi, t, 1);
omap2_mcspi_set_enable(spi, 1);
/* RX_ONLY mode needs dummy data in TX reg */
if (t->tx_buf == NULL)
writel_relaxed(0, cs->base
+ OMAP2_MCSPI_TX0);
if ((mcspi_dma->dma_rx && mcspi_dma->dma_tx) &&
(t->len >= DMA_MIN_BYTES))
count = omap2_mcspi_txrx_dma(spi, t);
else
count = omap2_mcspi_txrx_pio(spi, t);
if (count != t->len) {
status = -EIO;
goto out;
}
}
if (t->delay_usecs)
udelay(t->delay_usecs);
/* ignore the "leave it on after last xfer" hint */
if (t->cs_change) {
omap2_mcspi_force_cs(spi, 0);
cs_active = 0;
}
omap2_mcspi_set_enable(spi, 0);
if (mcspi->fifo_depth > 0)
omap2_mcspi_set_fifo(spi, t, 0);
out:
/* Restore defaults if they were overriden */ /* Restore defaults if they were overriden */
if (par_override) { if (par_override) {
par_override = 0; par_override = 0;
@ -1200,75 +1193,58 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m)
if (mcspi->fifo_depth > 0 && t) if (mcspi->fifo_depth > 0 && t)
omap2_mcspi_set_fifo(spi, t, 0); omap2_mcspi_set_fifo(spi, t, 0);
m->status = status; return status;
} }
static int omap2_mcspi_transfer_one_message(struct spi_master *master, static int omap2_mcspi_transfer_one(struct spi_master *master,
struct spi_message *m) struct spi_device *spi, struct spi_transfer *t)
{ {
struct spi_device *spi;
struct omap2_mcspi *mcspi; struct omap2_mcspi *mcspi;
struct omap2_mcspi_dma *mcspi_dma; struct omap2_mcspi_dma *mcspi_dma;
struct spi_transfer *t; const void *tx_buf = t->tx_buf;
int status; void *rx_buf = t->rx_buf;
unsigned len = t->len;
spi = m->spi;
mcspi = spi_master_get_devdata(master); mcspi = spi_master_get_devdata(master);
mcspi_dma = mcspi->dma_channels + spi->chip_select; mcspi_dma = mcspi->dma_channels + spi->chip_select;
m->actual_length = 0;
m->status = 0;
list_for_each_entry(t, &m->transfers, transfer_list) { if ((len && !(rx_buf || tx_buf))) {
const void *tx_buf = t->tx_buf; dev_dbg(mcspi->dev, "transfer: %d Hz, %d %s%s, %d bpw\n",
void *rx_buf = t->rx_buf; t->speed_hz,
unsigned len = t->len; len,
tx_buf ? "tx" : "",
rx_buf ? "rx" : "",
t->bits_per_word);
return -EINVAL;
}
if ((len && !(rx_buf || tx_buf))) { if (len < DMA_MIN_BYTES)
dev_dbg(mcspi->dev, "transfer: %d Hz, %d %s%s, %d bpw\n", goto skip_dma_map;
t->speed_hz,
len, if (mcspi_dma->dma_tx && tx_buf != NULL) {
tx_buf ? "tx" : "", t->tx_dma = dma_map_single(mcspi->dev, (void *) tx_buf,
rx_buf ? "rx" : "", len, DMA_TO_DEVICE);
t->bits_per_word); if (dma_mapping_error(mcspi->dev, t->tx_dma)) {
status = -EINVAL; dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
goto out; 'T', len);
return -EINVAL;
} }
}
if (m->is_dma_mapped || len < DMA_MIN_BYTES) if (mcspi_dma->dma_rx && rx_buf != NULL) {
continue; t->rx_dma = dma_map_single(mcspi->dev, rx_buf, t->len,
DMA_FROM_DEVICE);
if (mcspi_dma->dma_tx && tx_buf != NULL) { if (dma_mapping_error(mcspi->dev, t->rx_dma)) {
t->tx_dma = dma_map_single(mcspi->dev, (void *) tx_buf, dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
len, DMA_TO_DEVICE); 'R', len);
if (dma_mapping_error(mcspi->dev, t->tx_dma)) { if (tx_buf != NULL)
dev_dbg(mcspi->dev, "dma %cX %d bytes error\n", dma_unmap_single(mcspi->dev, t->tx_dma,
'T', len); len, DMA_TO_DEVICE);
status = -EINVAL; return -EINVAL;
goto out;
}
}
if (mcspi_dma->dma_rx && rx_buf != NULL) {
t->rx_dma = dma_map_single(mcspi->dev, rx_buf, t->len,
DMA_FROM_DEVICE);
if (dma_mapping_error(mcspi->dev, t->rx_dma)) {
dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
'R', len);
if (tx_buf != NULL)
dma_unmap_single(mcspi->dev, t->tx_dma,
len, DMA_TO_DEVICE);
status = -EINVAL;
goto out;
}
} }
} }
omap2_mcspi_work(mcspi, m); skip_dma_map:
/* spi_finalize_current_message() changes the status inside the return omap2_mcspi_work_one(mcspi, spi, t);
* spi_message, save the status here. */
status = m->status;
out:
spi_finalize_current_message(master);
return status;
} }
static int omap2_mcspi_master_setup(struct omap2_mcspi *mcspi) static int omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
@ -1347,7 +1323,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
master->setup = omap2_mcspi_setup; master->setup = omap2_mcspi_setup;
master->auto_runtime_pm = true; master->auto_runtime_pm = true;
master->transfer_one_message = omap2_mcspi_transfer_one_message; master->transfer_one = omap2_mcspi_transfer_one;
master->cleanup = omap2_mcspi_cleanup; master->cleanup = omap2_mcspi_cleanup;
master->dev.of_node = node; master->dev.of_node = node;
master->max_speed_hz = OMAP2_MCSPI_MAX_FREQ; master->max_speed_hz = OMAP2_MCSPI_MAX_FREQ;