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/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.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/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch b/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch index 39ca935ae9..24cda47789 100644 --- a/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch +++ b/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch @@ -14,11 +14,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> drivers/i2c/busses/i2c-pxa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c -index f20f8b905793..0becab239476 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c -@@ -1095,7 +1095,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num) +@@ -1054,7 +1054,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2 ret = i2c->msg_idx; if (!timeout && i2c->msg_num) { @@ -27,7 +25,7 @@ index f20f8b905793..0becab239476 100644 ret = I2C_RETRY; } -@@ -1169,7 +1169,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c) +@@ -1124,7 +1124,7 @@ static int i2c_pxa_pio_set_master(struct if (timeout < 0) { show_state(i2c); dev_err(&i2c->adap.dev, @@ -36,7 +34,7 @@ index f20f8b905793..0becab239476 100644 return I2C_RETRY; } -@@ -1213,7 +1213,7 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c, +@@ -1168,7 +1168,7 @@ static int i2c_pxa_do_pio_xfer(struct px out: if (timeout == 0) { @@ -45,6 +43,3 @@ index f20f8b905793..0becab239476 100644 ret = I2C_RETRY; } --- -2.20.1 - |