From 807366af3860a96078e71ad312f123caddf11d76 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 25 May 2020 18:24:54 +0200 Subject: 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 --- .../820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'target/linux/generic/backport-5.4/820-v5.8-i2c-pxa-use-master-abort-for-device-probes.patch') 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 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 - -- cgit v1.2.3