aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-05-25 18:24:54 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-05-25 21:10:44 +0200
commit807366af3860a96078e71ad312f123caddf11d76 (patch)
treec98424d85b2bf2a64cacd647d54198e826be893d /target/linux/generic/backport-5.4/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch
parent1b2144e81f74bc49705a4c0828a9678b899188ce (diff)
downloadupstream-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/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch')
-rw-r--r--target/linux/generic/backport-5.4/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/backport-5.4/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch b/target/linux/generic/backport-5.4/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch
index 4676d7721f..f14bb30e38 100644
--- a/target/linux/generic/backport-5.4/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch
+++ b/target/linux/generic/backport-5.4/818-v5.8-i2c-pxa-remove-some-unnecessary-debug.patch
@@ -18,11 +18,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
drivers/i2c/busses/i2c-pxa.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
-index 0becab239476..db739cce93ac 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
-@@ -1161,10 +1161,8 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c)
+@@ -1116,10 +1116,8 @@ static int i2c_pxa_pio_set_master(struct
/*
* Wait for the bus to become free.
*/
@@ -34,6 +32,3 @@ index 0becab239476..db739cce93ac 100644
if (timeout < 0) {
show_state(i2c);
---
-2.20.1
-