CONFIG_I2C_XILINX_ERRATA makes resetting XIIC after every Master Transmit error configurable. Also mention proper module name for XIIC kernel module.
Signed-off-by: Robert ABEL <[email protected]> --- drivers/i2c/busses/Kconfig | 9 ++++++++- drivers/i2c/busses/i2c-xiic.c | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 46d5488..3255e89 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -886,7 +886,14 @@ config I2C_XILINX Xilinx I2C controller. This driver can also be built as a module. If so, the module - will be called xilinx_i2c. + will be called i2c-xiic. + +config I2C_XILINX_ERRATA + bool "Reset on " + depends on I2C_XILINX + help + By enabling this option, the Xilinx I2C Controller will be reset + after Master Transmit Errors. config I2C_XLR tristate "XLR I2C support" diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index 5c9897e..6a834bc 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -509,6 +509,15 @@ static irqreturn_t xiic_process(int irq, void *dev_id) break; } +#if defined(CONFIG_I2C_XILINX_ERRATA) + if (!(msg->flags & I2C_M_RD)) { + /* dynamic mode seem to suffer from problems if we just flush + * fifos and the next message is a TX with len 0 (only addr) + * reset the IP instead of just flushing fifos + */ + xiic_reinit(i2c); + } +#endif } /* Receive FIFO is full */ -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
