diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:14 +0100 |
| commit | 4b51c747e4a52175e63d125db8365b38b06f0343 (patch) | |
| tree | cd03133d8efbf5a039c7cb369aa7eaa8c27d8ebe /drivers/spi/spi-fsl-lpspi.c | |
| parent | 92d58fd13af269552b65853d2c3a63970c4090bf (diff) | |
| parent | 0c903aafc8529f64d24d2cd6df32f2bf16aad20b (diff) | |
Merge branch 'spi-4.20' into spi-next
Diffstat (limited to 'drivers/spi/spi-fsl-lpspi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-lpspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c index e6d5cc6ab108..51670976faa3 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -276,7 +276,7 @@ static int fsl_lpspi_config(struct fsl_lpspi_data *fsl_lpspi) fsl_lpspi_set_watermark(fsl_lpspi); - temp = CFGR1_PCSCFG | CFGR1_MASTER | CFGR1_NOSTALL; + temp = CFGR1_PCSCFG | CFGR1_MASTER; if (fsl_lpspi->config.mode & SPI_CS_HIGH) temp |= CFGR1_PCSPOL; writel(temp, fsl_lpspi->base + IMX7ULP_CFGR1); |