Commit ed4121e1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang

i2c: sh_mobile: remove superfluous offset parameter

Following the KISS principle, remove unneeded stuff.
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 7fe8a999
...@@ -194,7 +194,7 @@ static void iic_set_clr(struct sh_mobile_i2c_data *pd, int offs, ...@@ -194,7 +194,7 @@ static void iic_set_clr(struct sh_mobile_i2c_data *pd, int offs,
iic_wr(pd, offs, (iic_rd(pd, offs) | set) & ~clr); iic_wr(pd, offs, (iic_rd(pd, offs) | set) & ~clr);
} }
static u32 sh_mobile_i2c_iccl(unsigned long count_khz, u32 tLOW, u32 tf, int offset) static u32 sh_mobile_i2c_iccl(unsigned long count_khz, u32 tLOW, u32 tf)
{ {
/* /*
* Conditional expression: * Conditional expression:
...@@ -206,10 +206,10 @@ static u32 sh_mobile_i2c_iccl(unsigned long count_khz, u32 tLOW, u32 tf, int off ...@@ -206,10 +206,10 @@ static u32 sh_mobile_i2c_iccl(unsigned long count_khz, u32 tLOW, u32 tf, int off
* account the fall time of SCL signal (tf). Default tf value * account the fall time of SCL signal (tf). Default tf value
* should be 0.3 us, for safety. * should be 0.3 us, for safety.
*/ */
return (((count_khz * (tLOW + tf)) + 5000) / 10000) + offset; return (((count_khz * (tLOW + tf)) + 5000) / 10000);
} }
static u32 sh_mobile_i2c_icch(unsigned long count_khz, u32 tHIGH, u32 tf, int offset) static u32 sh_mobile_i2c_icch(unsigned long count_khz, u32 tHIGH, u32 tf)
{ {
/* /*
* Conditional expression: * Conditional expression:
...@@ -225,14 +225,13 @@ static u32 sh_mobile_i2c_icch(unsigned long count_khz, u32 tHIGH, u32 tf, int of ...@@ -225,14 +225,13 @@ static u32 sh_mobile_i2c_icch(unsigned long count_khz, u32 tHIGH, u32 tf, int of
* to take into account the fall time of SDA signal (tf) at START * to take into account the fall time of SDA signal (tf) at START
* condition, in order to meet both tHIGH and tHD;STA specs. * condition, in order to meet both tHIGH and tHD;STA specs.
*/ */
return (((count_khz * (tHIGH + tf)) + 5000) / 10000) + offset; return (((count_khz * (tHIGH + tf)) + 5000) / 10000);
} }
static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd) static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd)
{ {
unsigned long i2c_clk_khz; unsigned long i2c_clk_khz;
u32 tHIGH, tLOW, tf; u32 tHIGH, tLOW, tf;
int offset;
/* Get clock rate after clock is enabled */ /* Get clock rate after clock is enabled */
clk_prepare_enable(pd->clk); clk_prepare_enable(pd->clk);
...@@ -243,26 +242,24 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd) ...@@ -243,26 +242,24 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd)
tLOW = 47; /* tLOW = 4.7 us */ tLOW = 47; /* tLOW = 4.7 us */
tHIGH = 40; /* tHD;STA = tHIGH = 4.0 us */ tHIGH = 40; /* tHD;STA = tHIGH = 4.0 us */
tf = 3; /* tf = 0.3 us */ tf = 3; /* tf = 0.3 us */
offset = 0; /* No offset */
} else if (pd->bus_speed == FAST_MODE) { } else if (pd->bus_speed == FAST_MODE) {
tLOW = 13; /* tLOW = 1.3 us */ tLOW = 13; /* tLOW = 1.3 us */
tHIGH = 6; /* tHD;STA = tHIGH = 0.6 us */ tHIGH = 6; /* tHD;STA = tHIGH = 0.6 us */
tf = 3; /* tf = 0.3 us */ tf = 3; /* tf = 0.3 us */
offset = 0; /* No offset */
} else { } else {
dev_err(pd->dev, "unrecognized bus speed %lu Hz\n", dev_err(pd->dev, "unrecognized bus speed %lu Hz\n",
pd->bus_speed); pd->bus_speed);
goto out; goto out;
} }
pd->iccl = sh_mobile_i2c_iccl(i2c_clk_khz, tLOW, tf, offset); pd->iccl = sh_mobile_i2c_iccl(i2c_clk_khz, tLOW, tf);
/* one more bit of ICCL in ICIC */ /* one more bit of ICCL in ICIC */
if ((pd->iccl > 0xff) && (pd->flags & IIC_FLAG_HAS_ICIC67)) if ((pd->iccl > 0xff) && (pd->flags & IIC_FLAG_HAS_ICIC67))
pd->icic |= ICIC_ICCLB8; pd->icic |= ICIC_ICCLB8;
else else
pd->icic &= ~ICIC_ICCLB8; pd->icic &= ~ICIC_ICCLB8;
pd->icch = sh_mobile_i2c_icch(i2c_clk_khz, tHIGH, tf, offset); pd->icch = sh_mobile_i2c_icch(i2c_clk_khz, tHIGH, tf);
/* one more bit of ICCH in ICIC */ /* one more bit of ICCH in ICIC */
if ((pd->icch > 0xff) && (pd->flags & IIC_FLAG_HAS_ICIC67)) if ((pd->icch > 0xff) && (pd->flags & IIC_FLAG_HAS_ICIC67))
pd->icic |= ICIC_ICCHB8; pd->icic |= ICIC_ICCHB8;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment