mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 14:38:20 +02:00
807366af38
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>
67 lines
2.0 KiB
Diff
67 lines
2.0 KiB
Diff
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Bcc: linux@mail.armlinux.org.uk
|
|
Cc: linux-i2c@vger.kernel.org
|
|
Subject: [PATCH 06/17] i2c: pxa: add and use definitions for IBMR register
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Add definitions for the bits in the IBMR register, and use them in the
|
|
code. This improves readability.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/i2c/busses/i2c-pxa.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-pxa.c
|
|
+++ b/drivers/i2c/busses/i2c-pxa.c
|
|
@@ -34,6 +34,9 @@
|
|
#include <linux/slab.h>
|
|
|
|
/* I2C register field definitions */
|
|
+#define IBMR_SDAS (1 << 0)
|
|
+#define IBMR_SCLS (1 << 1)
|
|
+
|
|
#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
|
|
return;
|
|
}
|
|
|
|
- while ((i > 0) && (readl(_IBMR(i2c)) & 0x1) == 0) {
|
|
+ while ((i > 0) && (readl(_IBMR(i2c)) & IBMR_SDAS) == 0) {
|
|
unsigned long icr = readl(_ICR(i2c));
|
|
|
|
icr &= ~ICR_START;
|
|
@@ -390,7 +393,8 @@ static int i2c_pxa_wait_master(struct px
|
|
* quick check of the i2c lines themselves to ensure they've
|
|
* gone high...
|
|
*/
|
|
- if ((readl(_ISR(i2c)) & (ISR_UB | ISR_IBB)) == 0 && readl(_IBMR(i2c)) == 3) {
|
|
+ if ((readl(_ISR(i2c)) & (ISR_UB | ISR_IBB)) == 0 &&
|
|
+ readl(_IBMR(i2c)) == (IBMR_SCLS | IBMR_SDAS)) {
|
|
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
|
|
timeout = 0x10000;
|
|
|
|
while (1) {
|
|
- if ((readl(_IBMR(i2c)) & 2) == 2)
|
|
+ if ((readl(_IBMR(i2c)) & IBMR_SCLS) == IBMR_SCLS)
|
|
break;
|
|
|
|
timeout--;
|
|
@@ -638,7 +642,7 @@ static void i2c_pxa_slave_start(struct p
|
|
timeout = 0x10000;
|
|
|
|
while (1) {
|
|
- if ((readl(_IBMR(i2c)) & 2) == 2)
|
|
+ if ((readl(_IBMR(i2c)) & IBMR_SCLS) == IBMR_SCLS)
|
|
break;
|
|
|
|
timeout--;
|