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/803-v5.8-i2c-pxa-use-official-address-byte-helper.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/803-v5.8-i2c-pxa-use-official-address-byte-helper.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/803-v5.8-i2c-pxa-use-official-address-byte-helper.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.4/803-v5.8-i2c-pxa-use-official-address-byte-helper.patch b/target/linux/generic/backport-5.4/803-v5.8-i2c-pxa-use-official-address-byte-helper.patch index 8aaa6c9b3c..c20a00c7f4 100644 --- a/target/linux/generic/backport-5.4/803-v5.8-i2c-pxa-use-official-address-byte-helper.patch +++ b/target/linux/generic/backport-5.4/803-v5.8-i2c-pxa-use-official-address-byte-helper.patch @@ -16,11 +16,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> drivers/i2c/busses/i2c-pxa.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) -diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c -index 2c3c3d6935c0..966000923e8e 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c -@@ -675,16 +675,6 @@ static void i2c_pxa_slave_stop(struct pxa_i2c *i2c) +@@ -675,16 +675,6 @@ static void i2c_pxa_slave_stop(struct px * PXA I2C Master mode */ @@ -37,7 +35,7 @@ index 2c3c3d6935c0..966000923e8e 100644 static inline void i2c_pxa_start_message(struct pxa_i2c *i2c) { u32 icr; -@@ -693,8 +683,8 @@ static inline void i2c_pxa_start_message(struct pxa_i2c *i2c) +@@ -692,8 +682,8 @@ static inline void i2c_pxa_start_message /* * Step 1: target slave address into IDBR */ @@ -48,7 +46,7 @@ index 2c3c3d6935c0..966000923e8e 100644 /* * Step 2: initiate the write. -@@ -1006,8 +999,8 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr) +@@ -1006,8 +996,8 @@ static void i2c_pxa_irq_txempty(struct p /* * Write the next address. */ @@ -59,6 +57,3 @@ index 2c3c3d6935c0..966000923e8e 100644 /* * And trigger a repeated start, and send the byte. --- -2.20.1 - |