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 --- .../811-v5.8-i2c-pxa-move-DT-IDs-along-side-platform-IDs.patch | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'target/linux/generic/backport-5.4/811-v5.8-i2c-pxa-move-DT-IDs-along-side-platform-IDs.patch') diff --git a/target/linux/generic/backport-5.4/811-v5.8-i2c-pxa-move-DT-IDs-along-side-platform-IDs.patch b/target/linux/generic/backport-5.4/811-v5.8-i2c-pxa-move-DT-IDs-along-side-platform-IDs.patch index 3f1b96a8d6..70ef8f35ab 100644 --- a/target/linux/generic/backport-5.4/811-v5.8-i2c-pxa-move-DT-IDs-along-side-platform-IDs.patch +++ b/target/linux/generic/backport-5.4/811-v5.8-i2c-pxa-move-DT-IDs-along-side-platform-IDs.patch @@ -14,11 +14,9 @@ Signed-off-by: Russell King drivers/i2c/busses/i2c-pxa.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c -index 482768a9fdd2..760a29fb6af5 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c -@@ -200,6 +200,15 @@ static struct pxa_reg_layout pxa_reg_layout[] = { +@@ -200,6 +200,15 @@ static struct pxa_reg_layout pxa_reg_lay }, }; @@ -34,7 +32,7 @@ index 482768a9fdd2..760a29fb6af5 100644 static const struct platform_device_id i2c_pxa_id_table[] = { { "pxa2xx-i2c", REGS_PXA2XX }, { "pxa3xx-pwri2c", REGS_PXA3XX }, -@@ -1184,15 +1193,6 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = { +@@ -1181,15 +1190,6 @@ static const struct i2c_algorithm i2c_px .functionality = i2c_pxa_functionality, }; @@ -50,6 +48,3 @@ index 482768a9fdd2..760a29fb6af5 100644 static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, enum pxa_i2c_types *i2c_types) { --- -2.20.1 - -- cgit v1.2.3