i2c: cadence: Add standard bus recovery support
Subsystems (2)
PATCH 1/1 i2c: cadence: Add standard bus recovery support
Hook up the standard GPIO/pinctrl-based recovery support for this driver.
Based on a patch "i2c: cadence: Recover bus after controller reset" by Chirag Parekh in the Xilinx kernel Git tree, but simplified to make use of more common code.
Cc Chirag Parekh <[email protected]>
Acked-by Michal Simek <[email protected]>
Signed-off-by Robert Hancock <[email protected]>
---
Previously submitted here: https://patchwork.ozlabs.org/project/linux-i2c/patch/[email protected]/
drivers/i2c/busses/i2c-cadence.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/i2c/busses/i2c-cadence.c +4 -0
@@ -179,6 +179,7 @@ enum cdns_i2c_slave_state {* @clk_rate_change_nb: Notifier block for clock rate changes * @quirks: flag for broken hold bit usage in r1p10 * @ctrl_reg: Cached value of the control register. +* @rinfo: Structure holding recovery information. * @ctrl_reg_diva_divb: value of fields DIV_A and DIV_B from CR register * @slave: Registered slave instance. * @dev_mode: I2C operating role(master/slave).
@@ -204,6 +205,7 @@ struct cdns_i2c {struct notifier_block clk_rate_change_nb;u32 quirks;u32 ctrl_reg; +struct i2c_bus_recovery_info rinfo;#if IS_ENABLED (CONFIG_I2C_SLAVE )u16 ctrl_reg_diva_divb;struct i2c_client *slave;
@@ -788,6 +790,7 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg,/* Wait for the signal of completion */ time_left =wait_for_completion_timeout (&id->xfer_done, adap->timeout);if (time_left ==0 ) { +i2c_recover_bus (adap);cdns_i2c_master_reset (adap);dev_err (id->adap.dev.parent,"timeout waiting on completion\n" );
@@ -1270,6 +1273,7 @@ static int cdns_i2c_probe(struct platform_device *pdev) id->adap.retries =3 ;/* Default retry value. */ id->adap.algo_data = id; id->adap.dev.parent = &pdev->dev; + id->adap.bus_recovery_info = &id->rinfo;init_completion (&id->xfer_done);snprintf (id->adap.name,sizeof (id->adap.name),"Cadence I2C at %08lx" , (unsigned long )r_mem->start);
Signature · 1 line
2.27.0