diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:26 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:26 +0900 |
| commit | 58b860ed4a77d9cb17b78e663a0341b79a12e240 (patch) | |
| tree | a82d81a9075394e7dc8b46fe2732270e24390a7a /drivers/spi/spi-fsl-lpspi.c | |
| parent | Linux 5.1-rc7 (diff) | |
| parent | spi: rspi: Fix handling of QSPI code when transmit and receive (diff) | |
| download | linux-dev-58b860ed4a77d9cb17b78e663a0341b79a12e240.tar.xz linux-dev-58b860ed4a77d9cb17b78e663a0341b79a12e240.zip | |
Merge branch 'spi-5.1' into spi-linus
Diffstat (limited to 'drivers/spi/spi-fsl-lpspi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-lpspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c index 391863914043..9e117c4635d8 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -62,7 +62,7 @@ #define CFGR1_PCSPOL BIT(8) #define CFGR1_NOSTALL BIT(3) #define CFGR1_MASTER BIT(0) -#define FSR_RXCOUNT (BIT(16)|BIT(17)|BIT(18)) +#define FSR_TXCOUNT (0xFF) #define RSR_RXEMPTY BIT(1) #define TCR_CPOL BIT(31) #define TCR_CPHA BIT(30) @@ -452,7 +452,7 @@ static irqreturn_t fsl_lpspi_isr(int irq, void *dev_id) } if (temp_SR & SR_MBF || - readl(fsl_lpspi->base + IMX7ULP_FSR) & FSR_RXCOUNT) { + readl(fsl_lpspi->base + IMX7ULP_FSR) & FSR_TXCOUNT) { writel(SR_FCF, fsl_lpspi->base + IMX7ULP_SR); fsl_lpspi_intctrl(fsl_lpspi, IER_FCIE); return IRQ_HANDLED; |