spi: sh-msiof: Fix setting SIRMDR1.SYNCAC to match SITMDR1.SYNCAC
According to section 59.2.4 MSIOF Receive Mode Register 1 (SIRMDR1) in
the R-Car Gen3 datasheet Rev.1.00, the value of the SIRMDR1.SYNCAC bit
must match the value of the SITMDR1.SYNCAC bit. However,
sh_msiof_spi_setup() changes only the latter.
Fix this by updating the SIRMDR1 register like the SITMDR1 register,
taking into account register bits that exist in SITMDR1 only.
Reported-by: Renesas BSP team via Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Fixes: 7ff0b53c40
("spi: sh-msiof: Avoid writing to registers from spi_master.setup()")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
bc519d9574
commit
0921e11e1e
|
@ -564,14 +564,16 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
|
||||||
|
|
||||||
/* Configure native chip select mode/polarity early */
|
/* Configure native chip select mode/polarity early */
|
||||||
clr = MDR1_SYNCMD_MASK;
|
clr = MDR1_SYNCMD_MASK;
|
||||||
set = MDR1_TRMD | TMDR1_PCON | MDR1_SYNCMD_SPI;
|
set = MDR1_SYNCMD_SPI;
|
||||||
if (spi->mode & SPI_CS_HIGH)
|
if (spi->mode & SPI_CS_HIGH)
|
||||||
clr |= BIT(MDR1_SYNCAC_SHIFT);
|
clr |= BIT(MDR1_SYNCAC_SHIFT);
|
||||||
else
|
else
|
||||||
set |= BIT(MDR1_SYNCAC_SHIFT);
|
set |= BIT(MDR1_SYNCAC_SHIFT);
|
||||||
pm_runtime_get_sync(&p->pdev->dev);
|
pm_runtime_get_sync(&p->pdev->dev);
|
||||||
tmp = sh_msiof_read(p, TMDR1) & ~clr;
|
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);
|
pm_runtime_put(&p->pdev->dev);
|
||||||
p->native_cs_high = spi->mode & SPI_CS_HIGH;
|
p->native_cs_high = spi->mode & SPI_CS_HIGH;
|
||||||
p->native_cs_inited = true;
|
p->native_cs_inited = true;
|
||||||
|
|
Loading…
Reference in New Issue