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

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

i2c: rcar: refactor bus state machine 



Remove the seperate functions and use designated constants. As readable
but less overhead.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 93e953d3

drivers/i2c/busses/i2c-rcar.c

+10 −27
Original line number Diff line number Diff line
@@ -79,11 +79,9 @@ 
#define MATE	(1 << 0)	/* address sent irq en */





enum {

	RCAR_BUS_PHASE_ADDR,

	RCAR_BUS_PHASE_DATA,

	RCAR_BUS_PHASE_STOP,

};

#define RCAR_BUS_PHASE_START	(MDBS | MIE | ESG)

#define RCAR_BUS_PHASE_DATA	(MDBS | MIE)

#define RCAR_BUS_PHASE_STOP	(MDBS | MIE | FSB)



enum {

	RCAR_IRQ_CLOSE,
@@ -204,21 +202,6 @@ static int rcar_i2c_bus_barrier(struct rcar_i2c_priv *priv) 
	return -EBUSY;

}



static void rcar_i2c_bus_phase(struct rcar_i2c_priv *priv, int phase)

{

	switch (phase) {

	case RCAR_BUS_PHASE_ADDR:

		rcar_i2c_write(priv, ICMCR, MDBS | MIE | ESG);

		break;

	case RCAR_BUS_PHASE_DATA:

		rcar_i2c_write(priv, ICMCR, MDBS | MIE);

		break;

	case RCAR_BUS_PHASE_STOP:

		rcar_i2c_write(priv, ICMCR, MDBS | MIE | FSB);

		break;

	}

}



/*

 *		clock function

 */
@@ -328,7 +311,7 @@ static int rcar_i2c_recv(struct rcar_i2c_priv *priv) 
{

	rcar_i2c_set_addr(priv, 1);

	rcar_i2c_status_clear(priv);

	rcar_i2c_bus_phase(priv, RCAR_BUS_PHASE_ADDR);

	rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_START);

	rcar_i2c_irq_mask(priv, RCAR_IRQ_OPEN_FOR_RECV);



	return 0;
@@ -347,7 +330,7 @@ static int rcar_i2c_send(struct rcar_i2c_priv *priv) 


	rcar_i2c_set_addr(priv, 0);

	rcar_i2c_status_clear(priv);

	rcar_i2c_bus_phase(priv, RCAR_BUS_PHASE_ADDR);

	rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_START);

	rcar_i2c_irq_mask(priv, RCAR_IRQ_OPEN_FOR_SEND);



	return 0;
@@ -376,7 +359,7 @@ static int rcar_i2c_irq_send(struct rcar_i2c_priv *priv, u32 msr) 
	 * goto data phase.

	 */

	if (msr & MAT)

		rcar_i2c_bus_phase(priv, RCAR_BUS_PHASE_DATA);

		rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_DATA);



	if (priv->pos < msg->len) {

		/*
@@ -404,7 +387,7 @@ static int rcar_i2c_irq_send(struct rcar_i2c_priv *priv, u32 msr) 
			 * prepare stop condition here.

			 * ID_DONE will be set on STOP irq.

			 */

			rcar_i2c_bus_phase(priv, RCAR_BUS_PHASE_STOP);

			rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_STOP);

		else

			/*

			 * If current msg is _NOT_ last msg,
@@ -452,9 +435,9 @@ static int rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr) 
	 * otherwise, go to DATA phase.

	 */

	if (priv->pos + 1 >= msg->len)

		rcar_i2c_bus_phase(priv, RCAR_BUS_PHASE_STOP);

		rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_STOP);

	else

		rcar_i2c_bus_phase(priv, RCAR_BUS_PHASE_DATA);

		rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_DATA);



	rcar_i2c_recv_restart(priv);
@@ -502,7 +485,7 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) 
		dev_dbg(dev, "Nack\n");



		/* go to stop phase */

		rcar_i2c_bus_phase(priv, RCAR_BUS_PHASE_STOP);

		rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_STOP);

		rcar_i2c_irq_mask(priv, RCAR_IRQ_OPEN_FOR_STOP);

		rcar_i2c_flags_set(priv, ID_NACK);

		goto out;