kernel: drop backported gpio emulated open drain output fix

[openwrt/staging/luka.git] / target / linux / generic / backport-5.4 / 809-v5.8-i2c-pxa-always-set-fm-and-hs-members-for-each-type.patch

diff --git a/target/linux/generic/backport-5.4/809-v5.8-i2c-pxa-always-set-fm-and-hs-members-for-each-type.patch b/target/linux/generic/backport-5.4/809-v5.8-i2c-pxa-always-set-fm-and-hs-members-for-each-type.patch
index 2e98c7ba00bd3386f32307a24e91e6607f7c07e2..9809d1dbbb99c46416f2d85ce9e37730a009fb45 100644 (file)
--- a/target/linux/generic/backport-5.4/809-v5.8-i2c-pxa-always-set-fm-and-hs-members-for-each-type.patch
+++ b/target/linux/generic/backport-5.4/809-v5.8-i2c-pxa-always-set-fm-and-hs-members-for-each-type.patch
@@ -15,11 +15,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  drivers/i2c/busses/i2c-pxa.c | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
-index b3286d7ab75d..05dbe6bf4633 100644
 --- a/drivers/i2c/busses/i2c-pxa.c
 +++ b/drivers/i2c/busses/i2c-pxa.c
-@@ -114,6 +114,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
+@@ -114,6 +114,8 @@ static struct pxa_reg_layout pxa_reg_lay
                .icr =  0x10,
                .isr =  0x18,
                .isar = 0x20,
@@ -28,7 +26,7 @@ index b3286d7ab75d..05dbe6bf4633 100644
        },
        [REGS_PXA3XX] = {
                .ibmr = 0x00,
-@@ -121,6 +123,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
+@@ -121,6 +123,8 @@ static struct pxa_reg_layout pxa_reg_lay
                .icr =  0x08,
                .isr =  0x0c,
                .isar = 0x10,
@@ -37,7 +35,7 @@ index b3286d7ab75d..05dbe6bf4633 100644
        },
        [REGS_CE4100] = {
                .ibmr = 0x14,
-@@ -128,6 +132,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
+@@ -128,6 +132,8 @@ static struct pxa_reg_layout pxa_reg_lay
                .icr =  0x00,
                .isr =  0x04,
                /* no isar register */
@@ -46,7 +44,7 @@ index b3286d7ab75d..05dbe6bf4633 100644
        },
        [REGS_PXA910] = {
                .ibmr = 0x00,
-@@ -137,6 +143,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
+@@ -137,6 +143,8 @@ static struct pxa_reg_layout pxa_reg_lay
                .isar = 0x20,
                .ilcr = 0x28,
                .iwcr = 0x30,
@@ -55,7 +53,7 @@ index b3286d7ab75d..05dbe6bf4633 100644
        },
        [REGS_A3700] = {
                .ibmr = 0x00,
-@@ -1235,8 +1243,8 @@ static int i2c_pxa_probe(struct platform_device *dev)
+@@ -1232,8 +1240,8 @@ static int i2c_pxa_probe(struct platform
        i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr;
        i2c->reg_icr = i2c->reg_base + pxa_reg_layout[i2c_type].icr;
        i2c->reg_isr = i2c->reg_base + pxa_reg_layout[i2c_type].isr;
@@ -66,6 +64,3 @@ index b3286d7ab75d..05dbe6bf4633 100644
  
        if (i2c_type != REGS_CE4100)
                i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;
--- 
-2.20.1
-