| Message ID | 1545397111-24183-3-git-send-email-qii.wang@mediatek.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | add i2c support for mt7629 and mt8183 | expand |
On Fri, Dec 21, 2018 at 8:59 PM qii wang <qii.wang@mediatek.com> wrote: > > Different speeds have been defined by macros, > so we use macros definitions. > > Signed-off-by: qii wang <qii.wang@mediatek.com> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> > --- > drivers/i2c/busses/i2c-mt65xx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c > index a74ef76..7396449 100644 > --- a/drivers/i2c/busses/i2c-mt65xx.c > +++ b/drivers/i2c/busses/i2c-mt65xx.c > @@ -456,7 +456,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, > > control_reg = readw(i2c->base + OFFSET_CONTROL) & > ~(I2C_CONTROL_DIR_CHANGE | I2C_CONTROL_RS); > - if ((i2c->speed_hz > 400000) || (left_num >= 1)) > + if ((i2c->speed_hz > MAX_FS_MODE_SPEED) || (left_num >= 1)) > control_reg |= I2C_CONTROL_RS; > > if (i2c->op == I2C_MASTER_WRRD) > @@ -465,7 +465,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, > writew(control_reg, i2c->base + OFFSET_CONTROL); > > /* set start condition */ > - if (i2c->speed_hz <= 100000) > + if (i2c->speed_hz <= I2C_DEFAULT_SPEED) > writew(I2C_ST_START_CON, i2c->base + OFFSET_EXT_CONF); > else > writew(I2C_FS_START_CON, i2c->base + OFFSET_EXT_CONF); > -- > 1.7.9.5 >
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index a74ef76..7396449 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -456,7 +456,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, control_reg = readw(i2c->base + OFFSET_CONTROL) & ~(I2C_CONTROL_DIR_CHANGE | I2C_CONTROL_RS); - if ((i2c->speed_hz > 400000) || (left_num >= 1)) + if ((i2c->speed_hz > MAX_FS_MODE_SPEED) || (left_num >= 1)) control_reg |= I2C_CONTROL_RS; if (i2c->op == I2C_MASTER_WRRD) @@ -465,7 +465,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, writew(control_reg, i2c->base + OFFSET_CONTROL); /* set start condition */ - if (i2c->speed_hz <= 100000) + if (i2c->speed_hz <= I2C_DEFAULT_SPEED) writew(I2C_ST_START_CON, i2c->base + OFFSET_EXT_CONF); else writew(I2C_FS_START_CON, i2c->base + OFFSET_EXT_CONF);
Different speeds have been defined by macros, so we use macros definitions. Signed-off-by: qii wang <qii.wang@mediatek.com> --- drivers/i2c/busses/i2c-mt65xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)