diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-06 10:36:38 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-05-12 12:37:15 +0200 |
| commit | e81c979f4e071d516aa27cf5a0c3939da00dc1ca (patch) | |
| tree | 60cd98b891b6cfcd2a5475ece284f48ce620ea09 | |
| parent | 18d30c0946f912cdb86ab0417661eccda6342375 (diff) | |
| download | linux-e81c979f4e071d516aa27cf5a0c3939da00dc1ca.tar.bz2 | |
i2c: pxa: clear all master action bits in i2c_pxa_stop_message()
If we timeout during a message transfer, the control register may
contain bits that cause an action to be set. Read-modify-writing the
register leaving these bits set may trigger the hardware to attempt
one of these actions unintentionally.
Always clear these bits when cleaning up after a message or after
a timeout.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index db739cce93ac..a72d07bdb793 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -795,11 +795,9 @@ static inline void i2c_pxa_stop_message(struct pxa_i2c *i2c) { u32 icr; - /* - * Clear the STOP and ACK flags - */ + /* Clear the START, STOP, ACK, TB and MA flags */ icr = readl(_ICR(i2c)); - icr &= ~(ICR_STOP | ICR_ACKNAK); + icr &= ~(ICR_START | ICR_STOP | ICR_ACKNAK | ICR_TB | ICR_MA); writel(icr, _ICR(i2c)); } |