diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-15 13:06:34 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-15 13:06:34 -0400 |
| commit | 3949ba3b3724e0304b0989ca4c1d785a1fb93ba0 (patch) | |
| tree | 6508295ee9d9e2dccb2a5a3dc053cdbb98d555b6 /drivers/spi/spi-stm32-qspi.c | |
| parent | 6d85028134d3f4f946924e2f9f0aaff47d9de840 (diff) | |
| parent | 5356c2c70e385198e1a753ee364323f2fc01f759 (diff) | |
Merge branch 'spi-5.1' into spi-5.2 for stm32
Diffstat (limited to 'drivers/spi/spi-stm32-qspi.c')
| -rw-r--r-- | drivers/spi/spi-stm32-qspi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 3b2a9a6b990d..7354f9d68dba 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c | |||
| @@ -76,7 +76,6 @@ | |||
| 76 | #define QSPI_PSMAR 0x28 | 76 | #define QSPI_PSMAR 0x28 |
| 77 | #define QSPI_PIR 0x2c | 77 | #define QSPI_PIR 0x2c |
| 78 | #define QSPI_LPTR 0x30 | 78 | #define QSPI_LPTR 0x30 |
| 79 | #define LPTR_DFT_TIMEOUT 0x10 | ||
| 80 | 79 | ||
| 81 | #define STM32_QSPI_MAX_MMAP_SZ SZ_256M | 80 | #define STM32_QSPI_MAX_MMAP_SZ SZ_256M |
| 82 | #define STM32_QSPI_MAX_NORCHIP 2 | 81 | #define STM32_QSPI_MAX_NORCHIP 2 |
| @@ -372,8 +371,7 @@ static int stm32_qspi_setup(struct spi_device *spi) | |||
| 372 | flash->presc = presc; | 371 | flash->presc = presc; |
| 373 | 372 | ||
| 374 | mutex_lock(&qspi->lock); | 373 | mutex_lock(&qspi->lock); |
| 375 | writel_relaxed(LPTR_DFT_TIMEOUT, qspi->io_base + QSPI_LPTR); | 374 | cr = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_SSHIFT | CR_EN; |
| 376 | cr = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_TCEN | CR_SSHIFT | CR_EN; | ||
| 377 | writel_relaxed(cr, qspi->io_base + QSPI_CR); | 375 | writel_relaxed(cr, qspi->io_base + QSPI_CR); |
| 378 | 376 | ||
| 379 | /* set dcr fsize to max address */ | 377 | /* set dcr fsize to max address */ |