diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 15:16:27 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 21:12:42 +0200 |
commit | 68d9cb82143b864d70e4fb3d7cbb7068f82216a1 (patch) | |
tree | 937de971cb0239c77a2e533022aba3fd4a8f36ba /target/linux/generic/backport-5.4/815-v5.8-i2c-pxa-consolidate-i2c_pxa_-xfer-implementations.patch | |
parent | 6062d858929df927e244280ec4864b35a217d6d1 (diff) | |
download | upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.gz upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.bz2 upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.zip |
kernel: Update kernel 5.4 to version 5.4.50
Run tested: ath79, ipq40xx
Build tested: ath79, ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/815-v5.8-i2c-pxa-consolidate-i2c_pxa_-xfer-implementations.patch')
-rw-r--r-- | target/linux/generic/backport-5.4/815-v5.8-i2c-pxa-consolidate-i2c_pxa_-xfer-implementations.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.4/815-v5.8-i2c-pxa-consolidate-i2c_pxa_-xfer-implementations.patch b/target/linux/generic/backport-5.4/815-v5.8-i2c-pxa-consolidate-i2c_pxa_-xfer-implementations.patch index d5fb1d2cbe..2debd4c86b 100644 --- a/target/linux/generic/backport-5.4/815-v5.8-i2c-pxa-consolidate-i2c_pxa_-xfer-implementations.patch +++ b/target/linux/generic/backport-5.4/815-v5.8-i2c-pxa-consolidate-i2c_pxa_-xfer-implementations.patch @@ -18,7 +18,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c -@@ -1061,18 +1061,20 @@ static int i2c_pxa_do_xfer(struct pxa_i2 +@@ -1059,18 +1059,20 @@ static int i2c_pxa_do_xfer(struct pxa_i2 return ret; } @@ -44,7 +44,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> udelay(100); } i2c_pxa_scream_blue_murder(i2c, "exhausted retries"); -@@ -1082,6 +1084,14 @@ static int i2c_pxa_xfer(struct i2c_adapt +@@ -1080,6 +1082,14 @@ static int i2c_pxa_xfer(struct i2c_adapt return ret; } @@ -59,7 +59,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> static u32 i2c_pxa_functionality(struct i2c_adapter *adap) { return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | -@@ -1165,7 +1175,6 @@ static int i2c_pxa_pio_xfer(struct i2c_a +@@ -1163,7 +1173,6 @@ static int i2c_pxa_pio_xfer(struct i2c_a struct i2c_msg msgs[], int num) { struct pxa_i2c *i2c = adap->algo_data; @@ -67,7 +67,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> /* If the I2C controller is disabled we need to reset it (probably due to a suspend/resume destroying state). We do -@@ -1174,20 +1183,7 @@ static int i2c_pxa_pio_xfer(struct i2c_a +@@ -1172,20 +1181,7 @@ static int i2c_pxa_pio_xfer(struct i2c_a if (!(readl(_ICR(i2c)) & ICR_IUE)) i2c_pxa_reset(i2c); |