diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-05-25 18:24:54 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-05-25 21:10:44 +0200 |
| commit | 807366af3860a96078e71ad312f123caddf11d76 (patch) | |
| tree | c98424d85b2bf2a64cacd647d54198e826be893d /target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch | |
| parent | 1b2144e81f74bc49705a4c0828a9678b899188ce (diff) | |
| download | upstream-807366af3860a96078e71ad312f123caddf11d76.tar.gz upstream-807366af3860a96078e71ad312f123caddf11d76.tar.bz2 upstream-807366af3860a96078e71ad312f123caddf11d76.zip | |
kernel: drop backported gpio emulated open drain output fix
This patch has been backported to stable kernel 5.4 already.
Remove our local patch explicitly now, as by applying the patch
(or refreshing) the relevant code is actually added a second time.
Refresh remaining patches as well.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch b/target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch index 2fde9e7322..cde9e3fe33 100644 --- a/target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch +++ b/target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch @@ -14,11 +14,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> drivers/i2c/busses/i2c-pxa.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c -index a72d07bdb793..0e194d6cd1b5 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c -@@ -940,14 +940,8 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr) +@@ -899,14 +899,8 @@ static void i2c_pxa_irq_txempty(struct p icr &= ~ICR_ALDIE; icr |= ICR_START | ICR_TB; } else { @@ -35,6 +33,3 @@ index a72d07bdb793..0e194d6cd1b5 100644 i2c_pxa_master_complete(i2c, 0); } --- -2.20.1 - |