Commit 4fe10de5 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: rcar: use the new get_bus_free callback 



To break out of recovery as early as possible, feed back the bus_free
logic state.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 7ca5f6be

drivers/i2c/busses/i2c-rcar.c

+11 −10
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ static void rcar_i2c_set_scl(struct i2c_adapter *adap, int val) 
	rcar_i2c_write(priv, ICMCR, priv->recovery_icmcr);

};



/* No get_sda, because the HW only reports its bus free logic, not SDA itself */



static void rcar_i2c_set_sda(struct i2c_adapter *adap, int val)

{

	struct rcar_i2c_priv *priv = i2c_get_adapdata(adap);
@@ -193,10 +191,19 @@ static void rcar_i2c_set_sda(struct i2c_adapter *adap, int val) 
	rcar_i2c_write(priv, ICMCR, priv->recovery_icmcr);

};



static int rcar_i2c_get_bus_free(struct i2c_adapter *adap)

{

	struct rcar_i2c_priv *priv = i2c_get_adapdata(adap);



	return !(rcar_i2c_read(priv, ICMCR) & FSDA);



};



static struct i2c_bus_recovery_info rcar_i2c_bri = {

	.get_scl = rcar_i2c_get_scl,

	.set_scl = rcar_i2c_set_scl,

	.set_sda = rcar_i2c_set_sda,

	.get_bus_free = rcar_i2c_get_bus_free,

	.recover_bus = i2c_generic_scl_recovery,

};

static void rcar_i2c_init(struct rcar_i2c_priv *priv)
@@ -211,7 +218,7 @@ static void rcar_i2c_init(struct rcar_i2c_priv *priv) 


static int rcar_i2c_bus_barrier(struct rcar_i2c_priv *priv)

{

	int i, ret;

	int i;



	for (i = 0; i < LOOP_TIMEOUT; i++) {

		/* make sure that bus is not busy */
@@ -222,13 +229,7 @@ static int rcar_i2c_bus_barrier(struct rcar_i2c_priv *priv) 


	/* Waiting did not help, try to recover */

	priv->recovery_icmcr = MDBS | OBPC | FSDA | FSCL;

	ret = i2c_recover_bus(&priv->adap);



	/* No failure when recovering, so check bus busy bit again */

	if (ret == 0)

		ret = (rcar_i2c_read(priv, ICMCR) & FSDA) ? -EBUSY : 0;



	return ret;

	return i2c_recover_bus(&priv->adap);

}



static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv, struct i2c_timings *t)