summaryrefslogtreecommitdiff
path: root/drivers/spi/omap3_spi.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-23 08:13:46 -0500
committerTom Rini <trini@konsulko.com>2016-02-23 08:13:46 -0500
commitb625fab7069cab52fd8e0c3dbb25e0d04d020173 (patch)
tree13d5c94c6c36724136264a4c3b9764583eace1c4 /drivers/spi/omap3_spi.c
parentbed6bd326e89366152609821a752d361b2183b46 (diff)
parent674f3609aad39f099a5c3605643a6be124504b96 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/omap3_spi.c')
-rw-r--r--drivers/spi/omap3_spi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 85f9e85fd4..95cdfa36ef 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -336,7 +336,6 @@ int omap3_spi_txrx(struct spi_slave *slave, unsigned int len,
struct omap3_spi_slave *ds = to_omap3_spi(slave);
ulong start;
int chconf = readl(&ds->regs->channel[ds->slave.cs].chconf);
- int irqstatus = readl(&ds->regs->irqstatus);
int i=0;
/*Enable SPI channel*/
@@ -351,7 +350,6 @@ int omap3_spi_txrx(struct spi_slave *slave, unsigned int len,
/*Shift in and out 1 byte at time*/
for (i=0; i < len; i++){
/* Write: wait for TX empty (TXS == 1)*/
- irqstatus |= (1<< (4*(ds->slave.bus)));
start = get_timer(0);
while (!(readl(&ds->regs->channel[ds->slave.cs].chstat) &
OMAP3_MCSPI_CHSTAT_TXS)) {