mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-25 00:01:35 +00:00
23 lines
814 B
Diff
23 lines
814 B
Diff
diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c
|
|
index 8533f4edd..6a14589cc 100644
|
|
--- a/drivers/spi/spi-sun6i.c
|
|
+++ b/drivers/spi/spi-sun6i.c
|
|
@@ -304,6 +304,9 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
|
|
|
|
sun6i_spi_write(sspi, SUN6I_CLK_CTL_REG, reg);
|
|
|
|
+ /* Finally enable the bus - doing so before might raise SCK to HIGH */
|
|
+ sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, sun6i_spi_read(sspi, SUN6I_GBL_CTL_REG) | SUN6I_GBL_CTL_BUS_ENABLE);
|
|
+
|
|
/* Setup the transfer now... */
|
|
if (sspi->tx_buf)
|
|
tx_len = tfr->len;
|
|
@@ -411,7 +414,7 @@ static int sun6i_spi_runtime_resume(struct device *dev)
|
|
}
|
|
|
|
sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG,
|
|
- SUN6I_GBL_CTL_BUS_ENABLE | SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP);
|
|
+ SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP);
|
|
|
|
return 0;
|
|
|