Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c78cdc1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: rcar: rework hw init 



We don't need to init HW before every transfer since we know the HW
state then. HW init at probe time is enough. While here, add setting the
clock register which belongs to init HW. Also, set MDBS bit since not
setting it is prohibited according to the manual.

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

drivers/i2c/busses/i2c-rcar.c

+4 −12
Original line number Diff line number Diff line
@@ -144,9 +144,10 @@ static void rcar_i2c_init(struct rcar_i2c_priv *priv) 
{

	/* reset master mode */

	rcar_i2c_write(priv, ICMIER, 0);

	rcar_i2c_write(priv, ICMCR, 0);

	rcar_i2c_write(priv, ICMCR, MDBS);

	rcar_i2c_write(priv, ICMSR, 0);

	rcar_i2c_write(priv, ICMAR, 0);

	/* start clock */

	rcar_i2c_write(priv, ICCCR, priv->icccr);

}



static int rcar_i2c_bus_barrier(struct rcar_i2c_priv *priv)
@@ -496,16 +497,6 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, 


	pm_runtime_get_sync(dev);



	/*-------------- spin lock -----------------*/

	spin_lock_irqsave(&priv->lock, flags);



	rcar_i2c_init(priv);

	/* start clock */

	rcar_i2c_write(priv, ICCCR, priv->icccr);



	spin_unlock_irqrestore(&priv->lock, flags);

	/*-------------- spin unlock -----------------*/



	ret = rcar_i2c_bus_barrier(priv);

	if (ret < 0)

		goto out;
@@ -666,6 +657,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto out_pm_put;



	rcar_i2c_init(priv);

	pm_runtime_put(dev);



	irq = platform_get_irq(pdev, 0);