diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-15 17:06:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-15 17:06:34 +0000 |
| commit | 3949ba3b3724e0304b0989ca4c1d785a1fb93ba0 (patch) | |
| tree | 6508295ee9d9e2dccb2a5a3dc053cdbb98d555b6 /drivers/spi/spi-stm32-qspi.c | |
| parent | 6d85028134d3f4f946924e2f9f0aaff47d9de840 (diff) | |
| parent | 5356c2c70e385198e1a753ee364323f2fc01f759 (diff) | |
| download | linux-next-3949ba3b3724e0304b0989ca4c1d785a1fb93ba0.tar.gz | |
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 @@ #define QSPI_PSMAR 0x28 #define QSPI_PIR 0x2c #define QSPI_LPTR 0x30 -#define LPTR_DFT_TIMEOUT 0x10 #define STM32_QSPI_MAX_MMAP_SZ SZ_256M #define STM32_QSPI_MAX_NORCHIP 2 @@ -372,8 +371,7 @@ static int stm32_qspi_setup(struct spi_device *spi) flash->presc = presc; mutex_lock(&qspi->lock); - writel_relaxed(LPTR_DFT_TIMEOUT, qspi->io_base + QSPI_LPTR); - cr = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_TCEN | CR_SSHIFT | CR_EN; + cr = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_SSHIFT | CR_EN; writel_relaxed(cr, qspi->io_base + QSPI_CR); /* set dcr fsize to max address */ |