spi: pxa2xx: Clear all RFT bits in reset_sccr1() on Intel Quark
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 6 Jul 2016 09:08:11 +0000 (12:08 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 7 Jul 2016 09:47:11 +0000 (11:47 +0200)
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
drivers/spi/spi-pxa2xx.c

index fe07c0592b44c9eac5faf22409203392cdbc9e3a..daf28443b7ad36d67ad45f31d13adbb149c09061 100644 (file)
@@ -585,7 +585,14 @@ static void reset_sccr1(struct driver_data *drv_data)
        u32 sccr1_reg;
 
        sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1) & ~drv_data->int_cr1;
-       sccr1_reg &= ~SSCR1_RFT;
+       switch (drv_data->ssp_type) {
+       case QUARK_X1000_SSP:
+               sccr1_reg &= ~QUARK_X1000_SSCR1_RFT;
+               break;
+       default:
+               sccr1_reg &= ~SSCR1_RFT;
+               break;
+       }
        sccr1_reg |= chip->threshold;
        pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg);
 }