i2c: mpc: Make use of i2c_recover_bus()

[ Upstream commit 65171b2df15eb7545431d75c2729b5062da89b43 ]

Move the existing calls of mpc_i2c_fixup() to a recovery function
registered via bus_recovery_info. This makes it more obvious that
recovery is supported and allows for a future where recovery is
triggered by the i2c core.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 48ecffecc0eda3fb42e63ff19a6e93d2f49ed918..f2e8b9a159a7589b1b98c0bc394fd3e39514d506 100644 (file)
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -581,7 +581,7 @@ static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                        if ((status & (CSR_MCF | CSR_MBB | CSR_RXAK)) != 0) {
                                writeb(status & ~CSR_MAL,
                                       i2c->base + MPC_I2C_SR);
-                               mpc_i2c_fixup(i2c);
+                               i2c_recover_bus(&i2c->adap);
                        }
                        return -EIO;
                }
@@ -617,7 +617,7 @@ static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                        if ((status & (CSR_MCF | CSR_MBB | CSR_RXAK)) != 0) {
                                writeb(status & ~CSR_MAL,
                                       i2c->base + MPC_I2C_SR);
-                               mpc_i2c_fixup(i2c);
+                               i2c_recover_bus(&i2c->adap);
                        }
                        return -EIO;
                }
@@ -632,6 +632,15 @@ static u32 mpc_functionality(struct i2c_adapter *adap)
          | I2C_FUNC_SMBUS_READ_BLOCK_DATA | I2C_FUNC_SMBUS_BLOCK_PROC_CALL;
 }
 
+static int fsl_i2c_bus_recovery(struct i2c_adapter *adap)
+{
+       struct mpc_i2c *i2c = i2c_get_adapdata(adap);
+
+       mpc_i2c_fixup(i2c);
+
+       return 0;
+}
+
 static const struct i2c_algorithm mpc_algo = {
        .master_xfer = mpc_xfer,
        .functionality = mpc_functionality,
@@ -643,6 +652,10 @@ static struct i2c_adapter mpc_ops = {
        .timeout = HZ,
 };
 
+static struct i2c_bus_recovery_info fsl_i2c_recovery_info = {
+       .recover_bus = fsl_i2c_bus_recovery,
+};
+
 static const struct of_device_id mpc_i2c_of_match[];
 static int fsl_i2c_probe(struct platform_device *op)
 {
@@ -735,6 +748,7 @@ static int fsl_i2c_probe(struct platform_device *op)
        i2c_set_adapdata(&i2c->adap, i2c);
        i2c->adap.dev.parent = &op->dev;
        i2c->adap.dev.of_node = of_node_get(op->dev.of_node);
+       i2c->adap.bus_recovery_info = &fsl_i2c_recovery_info;
 
        result = i2c_add_adapter(&i2c->adap);
        if (result < 0) {