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/814-v5.8-i2c-pxa-fix-i2c_pxa_wait_bus_not_busy-boundary-condi.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/814-v5.8-i2c-pxa-fix-i2c_pxa_wait_bus_not_busy-boundary-condi.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/814-v5.8-i2c-pxa-fix-i2c_pxa_wait_bus_not_busy-boundary-condi.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/backport-5.4/814-v5.8-i2c-pxa-fix-i2c_pxa_wait_bus_not_busy-boundary-condi.patch b/target/linux/generic/backport-5.4/814-v5.8-i2c-pxa-fix-i2c_pxa_wait_bus_not_busy-boundary-condi.patch index d5aded5479..2aadecc357 100644 --- a/target/linux/generic/backport-5.4/814-v5.8-i2c-pxa-fix-i2c_pxa_wait_bus_not_busy-boundary-condi.patch +++ b/target/linux/generic/backport-5.4/814-v5.8-i2c-pxa-fix-i2c_pxa_wait_bus_not_busy-boundary-condi.patch @@ -17,11 +17,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> drivers/i2c/busses/i2c-pxa.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) -diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c -index b2c7765756e2..19505ffbb8f1 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c -@@ -417,19 +417,26 @@ static void i2c_pxa_abort(struct pxa_i2c *i2c) +@@ -417,19 +417,26 @@ static void i2c_pxa_abort(struct pxa_i2c static int i2c_pxa_wait_bus_not_busy(struct pxa_i2c *i2c) { int timeout = DEF_TIMEOUT; @@ -53,6 +51,3 @@ index b2c7765756e2..19505ffbb8f1 100644 } static int i2c_pxa_wait_master(struct pxa_i2c *i2c) --- -2.20.1 - |