diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:03 +0100 |
| commit | 2337ff45293f36efa79247b3680223b9c9154392 (patch) | |
| tree | 3e64b61a18fefb351e1c58fec55d91332b69f873 /drivers/spi/spi-stm32-qspi.c | |
| parent | 6fbc7275c7a9ba97877050335f290341a1fd8dbf (diff) | |
| parent | 2b947137f2b8f77474dfe77d68c52778bf6ae453 (diff) | |
| download | linux-2337ff45293f36efa79247b3680223b9c9154392.tar.gz linux-2337ff45293f36efa79247b3680223b9c9154392.tar.bz2 linux-2337ff45293f36efa79247b3680223b9c9154392.zip | |
Merge branch 'spi-5.2' into spi-linus
Diffstat (limited to 'drivers/spi/spi-stm32-qspi.c')
| -rw-r--r-- | drivers/spi/spi-stm32-qspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 42f8e3c6aa1f..5dbb6a8e893c 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -29,7 +29,7 @@ #define CR_SSHIFT BIT(4) #define CR_DFM BIT(6) #define CR_FSEL BIT(7) -#define CR_FTHRES_MASK GENMASK(12, 8) +#define CR_FTHRES_SHIFT 8 #define CR_TEIE BIT(16) #define CR_TCIE BIT(17) #define CR_FTIE BIT(18) @@ -463,7 +463,7 @@ static int stm32_qspi_setup(struct spi_device *spi) flash->presc = presc; mutex_lock(&qspi->lock); - qspi->cr_reg = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_SSHIFT | CR_EN; + qspi->cr_reg = 3 << CR_FTHRES_SHIFT | CR_SSHIFT | CR_EN; writel_relaxed(qspi->cr_reg, qspi->io_base + QSPI_CR); /* set dcr fsize to max address */ |