diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-04 12:51:12 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-04 12:51:12 +0200 |
| commit | 16c10b3bf84df5564683c704039f6199b8359b16 (patch) | |
| tree | 3d25504362f952e0dd87a200b0d1050280539b81 /drivers/spi/spi-sh-msiof.c | |
| parent | spi: Fix typo on SPI_MEM help text (diff) | |
| parent | spi: sh-msiof: Fix setting SIRMDR1.SYNCAC to match SITMDR1.SYNCAC (diff) | |
| download | linux-16c10b3bf84df5564683c704039f6199b8359b16.tar.xz linux-16c10b3bf84df5564683c704039f6199b8359b16.zip | |
Merge branch 'spi-4.17' into spi-4.18 for the merge window
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 5c1ff0097e41..0e74cbf9929d 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -567,14 +567,16 @@ static int sh_msiof_spi_setup(struct spi_device *spi) /* Configure native chip select mode/polarity early */ clr = MDR1_SYNCMD_MASK; - set = MDR1_TRMD | TMDR1_PCON | MDR1_SYNCMD_SPI; + set = MDR1_SYNCMD_SPI; if (spi->mode & SPI_CS_HIGH) clr |= BIT(MDR1_SYNCAC_SHIFT); else set |= BIT(MDR1_SYNCAC_SHIFT); pm_runtime_get_sync(&p->pdev->dev); tmp = sh_msiof_read(p, TMDR1) & ~clr; - sh_msiof_write(p, TMDR1, tmp | set); + sh_msiof_write(p, TMDR1, tmp | set | MDR1_TRMD | TMDR1_PCON); + tmp = sh_msiof_read(p, RMDR1) & ~clr; + sh_msiof_write(p, RMDR1, tmp | set); pm_runtime_put(&p->pdev->dev); p->native_cs_high = spi->mode & SPI_CS_HIGH; p->native_cs_inited = true; |