diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2016-07-06 05:08:11 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-07-07 05:47:11 -0400 |
commit | 152bc19e2fc2b7fce7ffbc2a9cea94b147223702 (patch) | |
tree | 67218005bf4dff25dfc0df65f641c27866098bd3 /drivers/spi/spi-pxa2xx.c | |
parent | 1a695a905c18548062509178b98bc91e67510864 (diff) |
spi: pxa2xx: Clear all RFT bits in reset_sccr1() on Intel Quark
It seems the commit e5262d0568dc ("spi: spi-pxa2xx: SPI support for Intel Quark
X1000") misses one place to be adapted for Intel Quark, i.e. in reset_sccr1().
Clear all RFT bits when call reset_sccr1() on Intel Quark.
Fixes: e5262d0568dc ("spi: spi-pxa2xx: SPI support for Intel Quark X1000")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index fe07c0592b44..daf28443b7ad 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
@@ -585,7 +585,14 @@ static void reset_sccr1(struct driver_data *drv_data) | |||
585 | u32 sccr1_reg; | 585 | u32 sccr1_reg; |
586 | 586 | ||
587 | sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1) & ~drv_data->int_cr1; | 587 | sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1) & ~drv_data->int_cr1; |
588 | sccr1_reg &= ~SSCR1_RFT; | 588 | switch (drv_data->ssp_type) { |
589 | case QUARK_X1000_SSP: | ||
590 | sccr1_reg &= ~QUARK_X1000_SSCR1_RFT; | ||
591 | break; | ||
592 | default: | ||
593 | sccr1_reg &= ~SSCR1_RFT; | ||
594 | break; | ||
595 | } | ||
589 | sccr1_reg |= chip->threshold; | 596 | sccr1_reg |= chip->threshold; |
590 | pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg); | 597 | pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg); |
591 | } | 598 | } |