diff options
| author | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /drivers/spi/spi-dw.c | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'drivers/spi/spi-dw.c')
| -rw-r--r-- | drivers/spi/spi-dw.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index 8d67d03c71eb..4fbfcdc5cb24 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -194,7 +194,7 @@ static void dw_writer(struct dw_spi *dws)  			else  				txw = *(u16 *)(dws->tx);  		} -		dw_writel(dws, DW_SPI_DR, txw); +		dw_write_io_reg(dws, DW_SPI_DR, txw);  		dws->tx += dws->n_bytes;  	}  } @@ -205,7 +205,7 @@ static void dw_reader(struct dw_spi *dws)  	u16 rxw;  	while (max--) { -		rxw = dw_readl(dws, DW_SPI_DR); +		rxw = dw_read_io_reg(dws, DW_SPI_DR);  		/* Care rx only if the transfer's original "rx" is not null */  		if (dws->rx_end - dws->len) {  			if (dws->n_bytes == 1)  |