i2c: sh_mobile: replace magic hex values with constants
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Fri, 2 May 2014 19:15:07 +0000 (21:15 +0200)
committerSimon Horman <horms@verge.net.au>
Fri, 5 Dec 2014 00:22:41 +0000 (09:22 +0900)
No functional change, binaries are identical.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit a78f6a4140f95cbedc0b28c4c883e8aa9ba044f1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
drivers/i2c/busses/i2c-sh_mobile.c

index 1d79585..d91625e 100644 (file)
@@ -316,7 +316,7 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd,
 
        switch (op) {
        case OP_START: /* issue start and trigger DTE interrupt */
-               iic_wr(pd, ICCR, 0x94);
+               iic_wr(pd, ICCR, ICCR_ICE | ICCR_TRS | ICCR_BBSY);
                break;
        case OP_TX_FIRST: /* disable DTE interrupt and write data */
                iic_wr(pd, ICIC, ICIC_WAITE | ICIC_ALE | ICIC_TACKE);
@@ -327,10 +327,11 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd,
                break;
        case OP_TX_STOP: /* write data and issue a stop afterwards */
                iic_wr(pd, ICDR, data);
-               iic_wr(pd, ICCR, pd->send_stop ? 0x90 : 0x94);
+               iic_wr(pd, ICCR, pd->send_stop ? ICCR_ICE | ICCR_TRS
+                                              : ICCR_ICE | ICCR_TRS | ICCR_BBSY);
                break;
        case OP_TX_TO_RX: /* select read mode */
-               iic_wr(pd, ICCR, 0x81);
+               iic_wr(pd, ICCR, ICCR_ICE | ICCR_SCP);
                break;
        case OP_RX: /* just read data */
                ret = iic_rd(pd, ICDR);
@@ -338,13 +339,13 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd,
        case OP_RX_STOP: /* enable DTE interrupt, issue stop */
                iic_wr(pd, ICIC,
                       ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE);
-               iic_wr(pd, ICCR, 0xc0);
+               iic_wr(pd, ICCR, ICCR_ICE | ICCR_RACK);
                break;
        case OP_RX_STOP_DATA: /* enable DTE interrupt, read data, issue stop */
                iic_wr(pd, ICIC,
                       ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE);
                ret = iic_rd(pd, ICDR);
-               iic_wr(pd, ICCR, 0xc0);
+               iic_wr(pd, ICCR, ICCR_ICE | ICCR_RACK);
                break;
        }