Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / spi / spi-pxa2xx.c

diff --git a/kernel/drivers/spi/spi-pxa2xx.c b/kernel/drivers/spi/spi-pxa2xx.c
index b25dc71..3cac73e 100644 (file)
--- a/kernel/drivers/spi/spi-pxa2xx.c
+++ b/kernel/drivers/spi/spi-pxa2xx.c
@@ -111,7 +111,7 @@ static const struct lpss_config lpss_platforms[] = {
                .reg_general = -1,
                .reg_ssp = 0x20,
                .reg_cs_ctrl = 0x24,
-               .reg_capabilities = 0xfc,
+               .reg_capabilities = -1,
                .rx_threshold = 1,
                .tx_threshold_lo = 32,
                .tx_threshold_hi = 56,
@@ -548,7 +548,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);
 }