* Fixxes #1788 - Code taken from https://linux-sunxi.org/SPIdev
* Additional Patch for 5.5
This commit is contained in:
Elias Kotlyar 2020-02-13 20:32:06 +01:00 committed by GitHub
parent d6e13612d1
commit d43f389035
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 0 deletions

View File

@ -0,0 +1,27 @@
Index: drivers/spi/spi-sun4i.c
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- a/drivers/spi/spi-sun4i.c (date 1581011681000)
+++ b/drivers/spi/spi-sun4i.c (date 1581070363000)
@@ -389,6 +389,7 @@
struct spi_master *master = dev_get_drvdata(dev);
struct sun4i_spi *sspi = spi_master_get_devdata(master);
int ret;
+ u32 reg;
ret = clk_prepare_enable(sspi->hclk);
if (ret) {
@@ -401,9 +402,10 @@
dev_err(dev, "Couldn't enable module clock\n");
goto err;
}
+ reg = sun4i_spi_read(sspi, SUN4I_CTL_REG);
sun4i_spi_write(sspi, SUN4I_CTL_REG,
- SUN4I_CTL_ENABLE | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
+ reg | SUN4I_CTL_ENABLE | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
return 0;

View File

@ -0,0 +1,27 @@
Index: drivers/spi/spi-sun4i.c
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- a/drivers/spi/spi-sun4i.c (date 1581011681000)
+++ b/drivers/spi/spi-sun4i.c (date 1581070363000)
@@ -389,6 +389,7 @@
struct spi_master *master = dev_get_drvdata(dev);
struct sun4i_spi *sspi = spi_master_get_devdata(master);
int ret;
+ u32 reg;
ret = clk_prepare_enable(sspi->hclk);
if (ret) {
@@ -401,9 +402,10 @@
dev_err(dev, "Couldn't enable module clock\n");
goto err;
}
+ reg = sun4i_spi_read(sspi, SUN4I_CTL_REG);
sun4i_spi_write(sspi, SUN4I_CTL_REG,
- SUN4I_CTL_ENABLE | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
+ reg | SUN4I_CTL_ENABLE | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
return 0;