kernel: move mtd ofpart accepted patch

[openwrt/openwrt.git] / target / linux / generic / backport-5.4 / 808-v5.8-i2c-pxa-add-and-use-definitions-for-IBMR-register.patch

diff --git a/target/linux/generic/backport-5.4/808-v5.8-i2c-pxa-add-and-use-definitions-for-IBMR-register.patch b/target/linux/generic/backport-5.4/808-v5.8-i2c-pxa-add-and-use-definitions-for-IBMR-register.patch
index 16518b0e6676c4b2f237d131339bf6e233ddb2ea..f197808d2336cb8f3e285623f5ea85e49e645500 100644 (file)
--- a/target/linux/generic/backport-5.4/808-v5.8-i2c-pxa-add-and-use-definitions-for-IBMR-register.patch
+++ b/target/linux/generic/backport-5.4/808-v5.8-i2c-pxa-add-and-use-definitions-for-IBMR-register.patch
@@ -27,7 +27,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  #define ICR_START     (1 << 0)           /* start bit */
  #define ICR_STOP      (1 << 1)           /* stop bit */
  #define ICR_ACKNAK    (1 << 2)           /* send ACK(0) or NAK(1) */
-@@ -335,7 +338,7 @@ static void i2c_pxa_abort(struct pxa_i2c
+@@ -334,7 +337,7 @@ static void i2c_pxa_abort(struct pxa_i2c
                return;
        }
  
@@ -36,7 +36,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
                unsigned long icr = readl(_ICR(i2c));
  
                icr &= ~ICR_START;
-@@ -390,7 +393,8 @@ static int i2c_pxa_wait_master(struct px
+@@ -389,7 +392,8 @@ static int i2c_pxa_wait_master(struct px
                 * quick check of the i2c lines themselves to ensure they've
                 * gone high...
                 */
@@ -46,7 +46,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
                        if (i2c_debug > 0)
                                dev_dbg(&i2c->adap.dev, "%s: done\n", __func__);
                        return 1;
-@@ -575,7 +579,7 @@ static void i2c_pxa_slave_start(struct p
+@@ -574,7 +578,7 @@ static void i2c_pxa_slave_start(struct p
        timeout = 0x10000;
  
        while (1) {
@@ -55,7 +55,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
                        break;
  
                timeout--;
-@@ -638,7 +642,7 @@ static void i2c_pxa_slave_start(struct p
+@@ -637,7 +641,7 @@ static void i2c_pxa_slave_start(struct p
        timeout = 0x10000;
  
        while (1) {