summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-bfin-sport.c
diff options
context:
space:
mode:
authorScott Jiang <scott.jiang.linux@gmail.com>2012-04-24 00:18:09 +0200
committerGrant Likely <grant.likely@secretlab.ca>2012-04-27 20:16:21 +0200
commit488e1a9de27f0a299fc185f0b5c67246a3f0c6c9 (patch)
treea4c3130931148e5d3744e8fbb7b69fc8d924959e /drivers/spi/spi-bfin-sport.c
parentspi/bfin5xx: rename config macro name for bfin5xx spi controller driver (diff)
downloadlinux-488e1a9de27f0a299fc185f0b5c67246a3f0c6c9.tar.xz
linux-488e1a9de27f0a299fc185f0b5c67246a3f0c6c9.zip
spi/spi-bfin-sport: move word length setup to transfer handler
Each transfer may have its own bits per word. Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to '')
-rw-r--r--drivers/spi/spi-bfin-sport.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 248a2cc671a9..bfd90474c7e2 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -252,19 +252,15 @@ static void
bfin_sport_spi_restore_state(struct bfin_sport_spi_master_data *drv_data)
{
struct bfin_sport_spi_slave_data *chip = drv_data->cur_chip;
- unsigned int bits = (drv_data->ops == &bfin_sport_transfer_ops_u8 ? 7 : 15);
bfin_sport_spi_disable(drv_data);
dev_dbg(drv_data->dev, "restoring spi ctl state\n");
bfin_write(&drv_data->regs->tcr1, chip->ctl_reg);
- bfin_write(&drv_data->regs->tcr2, bits);
bfin_write(&drv_data->regs->tclkdiv, chip->baud);
- bfin_write(&drv_data->regs->tfsdiv, bits);
SSYNC();
bfin_write(&drv_data->regs->rcr1, chip->ctl_reg & ~(ITCLK | ITFS));
- bfin_write(&drv_data->regs->rcr2, bits);
SSYNC();
bfin_sport_spi_cs_active(chip);
@@ -425,6 +421,9 @@ bfin_sport_spi_pump_transfers(unsigned long data)
drv_data->ops = &bfin_sport_transfer_ops_u8;
else
drv_data->ops = &bfin_sport_transfer_ops_u16;
+ bfin_write(&drv_data->regs->tcr2, bits_per_word - 1);
+ bfin_write(&drv_data->regs->tfsdiv, bits_per_word - 1);
+ bfin_write(&drv_data->regs->rcr2, bits_per_word - 1);
drv_data->state = RUNNING_STATE;