Commit 2fd6cbf4 authored by Russell King's avatar Russell King Committed by Wolfram Sang

i2c: pxa: use master-abort for device probes

Use master-abort to send the stop condition after an address cycle
rather than resetting the controller.
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent e81c979f
...@@ -940,14 +940,8 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr) ...@@ -940,14 +940,8 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr)
icr &= ~ICR_ALDIE; icr &= ~ICR_ALDIE;
icr |= ICR_START | ICR_TB; icr |= ICR_START | ICR_TB;
} else { } else {
if (i2c->msg->len == 0) { if (i2c->msg->len == 0)
/* icr |= ICR_MA;
* Device probes have a message length of zero
* and need the bus to be reset before it can
* be used again.
*/
i2c_pxa_reset(i2c);
}
i2c_pxa_master_complete(i2c, 0); i2c_pxa_master_complete(i2c, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment