Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: spi-sun6i: Fix chipselect/clock bug

The current sun6i SPI implementation initializes the transfer too early,
resulting in SCK going high before the transfer. When using an additional
(gpio) chipselect with sun6i, the chipselect is asserted at a time when
clock is high, making the SPI transfer fail.

This is due to SUN6I_GBL_CTL_BUS_ENABLE being written into
SUN6I_GBL_CTL_REG at an early stage. Moving that to the transfer
function, hence, right before the transfer starts, mitigates that
problem.

Fixes: 3558fe900e8af (spi: sunxi: Add Allwinner A31 SPI controller driver)
Signed-off-by: Mirko Vogt <mirko-dev|linux@nanl.de>
Signed-off-by: Ralf Schlatterbeck <rsc@runtux.com>
Link: https://lore.kernel.org/r/20210614144507.y3udezjfbko7eavv@runtux.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Mirko Vogt and committed by
Mark Brown
0d7993b2 f422316c

+5 -1
+5 -1
drivers/spi/spi-sun6i.c
··· 379 379 } 380 380 381 381 sun6i_spi_write(sspi, SUN6I_CLK_CTL_REG, reg); 382 + /* Finally enable the bus - doing so before might raise SCK to HIGH */ 383 + reg = sun6i_spi_read(sspi, SUN6I_GBL_CTL_REG); 384 + reg |= SUN6I_GBL_CTL_BUS_ENABLE; 385 + sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, reg); 382 386 383 387 /* Setup the transfer now... */ 384 388 if (sspi->tx_buf) ··· 508 504 } 509 505 510 506 sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, 511 - SUN6I_GBL_CTL_BUS_ENABLE | SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); 507 + SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); 512 508 513 509 return 0; 514 510