diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-05 05:19:10 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-05 05:19:10 +0200 |
| commit | e1a7d1673062a6a9160b1fc94e1540b747398e01 (patch) | |
| tree | 77ed1ca15537d1ae04a6ab0ff6128567c0fa497e /drivers/spi/spi-fsl-lpspi.c | |
| parent | spi: sh-msiof: Convert to use GPIO descriptors (diff) | |
| parent | spi: tegra114: avoid reset call in atomic context (diff) | |
| download | linux-e1a7d1673062a6a9160b1fc94e1540b747398e01.tar.xz linux-e1a7d1673062a6a9160b1fc94e1540b747398e01.zip | |
Merge branch 'spi-5.1' into spi-5.2
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 2ad9d6262c2b..33b6a8affd55 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -77,7 +77,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) @@ -771,7 +771,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; |