* [PATCH] i2c: rk3x: fix divisor calculation for SCL frequency @ 2014-09-05 2:32 Addy Ke 2014-09-05 4:31 ` Doug Anderson 2014-09-08 3:38 ` [PATCH v2] " Addy Ke 0 siblings, 2 replies; 7+ messages in thread From: Addy Ke @ 2014-09-05 2:32 UTC (permalink / raw) To: linux-arm-kernel I2C_CLKDIV register descripted in the previous version of RK3x chip manual is incorrect. Plus 1 is required. The correct formula: - T(SCL_HIGH) = T(PCLK) * (CLKDIVH + 1) * 8 - T(SCL_LOW) = T(PCLK) * (CLKDIVL + 1) * 8 - (SCL Divsor) = 8 * ((CLKDIVL + 1) + (CLKDIVH + 1)) - SCL = PCLK / (CLK Divsor) It will be updated to the latest version of chip manual. Signed-off-by: Addy Ke <addy.ke@rock-chips.com> --- drivers/i2c/busses/i2c-rk3x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c index e637c32..76b6604 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -433,8 +433,8 @@ static void rk3x_i2c_set_scl_rate(struct rk3x_i2c *i2c, unsigned long scl_rate) unsigned long i2c_rate = clk_get_rate(i2c->clk); unsigned int div; - /* SCL rate = (clk rate) / (8 * DIV) */ - div = DIV_ROUND_UP(i2c_rate, scl_rate * 8); + /* SCL rate = (clk rate) / (8 * (DIV + 2)) */ + div = DIV_ROUND_UP(i2c_rate, scl_rate * 8) - 2; /* The lower and upper half of the CLKDIV reg describe the length of * SCL low & high periods. */ -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] i2c: rk3x: fix divisor calculation for SCL frequency 2014-09-05 2:32 [PATCH] i2c: rk3x: fix divisor calculation for SCL frequency Addy Ke @ 2014-09-05 4:31 ` Doug Anderson 2014-09-05 10:17 ` addy ke 2014-09-08 3:38 ` [PATCH v2] " Addy Ke 1 sibling, 1 reply; 7+ messages in thread From: Doug Anderson @ 2014-09-05 4:31 UTC (permalink / raw) To: linux-arm-kernel Addy, On Thu, Sep 4, 2014 at 7:32 PM, Addy Ke <addy.ke@rock-chips.com> wrote: > I2C_CLKDIV register descripted in the previous version of > RK3x chip manual is incorrect. Plus 1 is required. > > The correct formula: > - T(SCL_HIGH) = T(PCLK) * (CLKDIVH + 1) * 8 > - T(SCL_LOW) = T(PCLK) * (CLKDIVL + 1) * 8 > - (SCL Divsor) = 8 * ((CLKDIVL + 1) + (CLKDIVH + 1)) > - SCL = PCLK / (CLK Divsor) I'll trust that you tested this with a scope > It will be updated to the latest version of chip manual. > > Signed-off-by: Addy Ke <addy.ke@rock-chips.com> > --- > drivers/i2c/busses/i2c-rk3x.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c > index e637c32..76b6604 100644 > --- a/drivers/i2c/busses/i2c-rk3x.c > +++ b/drivers/i2c/busses/i2c-rk3x.c > @@ -433,8 +433,8 @@ static void rk3x_i2c_set_scl_rate(struct rk3x_i2c *i2c, unsigned long scl_rate) > unsigned long i2c_rate = clk_get_rate(i2c->clk); > unsigned int div; > > - /* SCL rate = (clk rate) / (8 * DIV) */ > - div = DIV_ROUND_UP(i2c_rate, scl_rate * 8); > + /* SCL rate = (clk rate) / (8 * (DIV + 2)) */ > + div = DIV_ROUND_UP(i2c_rate, scl_rate * 8) - 2; Given the bug I just fixed in the Rockchip SPI driver, I was a little worried about div becoming -1 (and thus being a really large positive number since div is unsigned). However, it seems that you get saved by the next statement: div = DIV_ROUND_UP(div, 2); In the testing I did with the Linux macros, that magically transformed a div of 0xFFFFFFFF (-1) to 0, so it's not technically a bug. ...but it's very non-obvious. Can you do something a little cleaner? -Doug ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] i2c: rk3x: fix divisor calculation for SCL frequency 2014-09-05 4:31 ` Doug Anderson @ 2014-09-05 10:17 ` addy ke 2014-09-05 15:20 ` Doug Anderson 0 siblings, 1 reply; 7+ messages in thread From: addy ke @ 2014-09-05 10:17 UTC (permalink / raw) To: linux-arm-kernel > Addy, > > On Thu, Sep 4, 2014 at 7:32 PM, Addy Ke <addy.ke@rock-chips.com> wrote: >> I2C_CLKDIV register descripted in the previous version of >> RK3x chip manual is incorrect. Plus 1 is required. >> >> The correct formula: >> - T(SCL_HIGH) = T(PCLK) * (CLKDIVH + 1) * 8 >> - T(SCL_LOW) = T(PCLK) * (CLKDIVL + 1) * 8 >> - (SCL Divsor) = 8 * ((CLKDIVL + 1) + (CLKDIVH + 1)) >> - SCL = PCLK / (CLK Divsor) > > I'll trust that you tested this with a scope > Yes ,I have tested on RK3188 and RK3288, and confirmed by oscilloscope. > >> It will be updated to the latest version of chip manual. >> >> Signed-off-by: Addy Ke <addy.ke@rock-chips.com> >> --- >> drivers/i2c/busses/i2c-rk3x.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c >> index e637c32..76b6604 100644 >> --- a/drivers/i2c/busses/i2c-rk3x.c >> +++ b/drivers/i2c/busses/i2c-rk3x.c >> @@ -433,8 +433,8 @@ static void rk3x_i2c_set_scl_rate(struct rk3x_i2c *i2c, unsigned long scl_rate) >> unsigned long i2c_rate = clk_get_rate(i2c->clk); >> unsigned int div; >> >> - /* SCL rate = (clk rate) / (8 * DIV) */ >> - div = DIV_ROUND_UP(i2c_rate, scl_rate * 8); >> + /* SCL rate = (clk rate) / (8 * (DIV + 2)) */ >> + div = DIV_ROUND_UP(i2c_rate, scl_rate * 8) - 2; > > Given the bug I just fixed in the Rockchip SPI driver, I was a little > worried about div becoming -1 (and thus being a really large positive > number since div is unsigned). > > However, it seems that you get saved by the next statement: > div = DIV_ROUND_UP(div, 2); > > In the testing I did with the Linux macros, that magically transformed > a div of 0xFFFFFFFF (-1) to 0, so it's not technically a bug. ...but > it's very non-obvious. Can you do something a little cleaner? The following modifications is reasonable? static void rk3x_i2c_set_scl_rate(struct rk3x_i2c *i2c, unsigned long scl_rate) { unsigned long i2c_rate = clk_get_rate(i2c->clk); unsigned int div; /* set DIV = DIVH = DIVL * SCL rate = (clk rate) / (8 * (DIVH + 1 + DIVL + 1)) * = (clk rate) / (16 * (DIV + 1)) */ div = DIV_ROUND_UP(i2c_rate, scl_rate * 16) - 1; i2c_writel(i2c, (div << 16) | (div & 0xffff), REG_CLKDIV); } > > -Doug > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] i2c: rk3x: fix divisor calculation for SCL frequency 2014-09-05 10:17 ` addy ke @ 2014-09-05 15:20 ` Doug Anderson 0 siblings, 0 replies; 7+ messages in thread From: Doug Anderson @ 2014-09-05 15:20 UTC (permalink / raw) To: linux-arm-kernel Addy, On Fri, Sep 5, 2014 at 3:17 AM, addy ke <addy.ke@rock-chips.com> wrote: > The following modifications is reasonable? > > static void rk3x_i2c_set_scl_rate(struct rk3x_i2c *i2c, unsigned long scl_rate) > { > unsigned long i2c_rate = clk_get_rate(i2c->clk); > unsigned int div; > > /* set DIV = DIVH = DIVL > * SCL rate = (clk rate) / (8 * (DIVH + 1 + DIVL + 1)) > * = (clk rate) / (16 * (DIV + 1)) > */ > div = DIV_ROUND_UP(i2c_rate, scl_rate * 16) - 1; > > i2c_writel(i2c, (div << 16) | (div & 0xffff), REG_CLKDIV); > } Yes, that looks much cleaner and is a nice solution, thanks! Can you send up a new patch version? -Doug ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] i2c: rk3x: fix divisor calculation for SCL frequency 2014-09-05 2:32 [PATCH] i2c: rk3x: fix divisor calculation for SCL frequency Addy Ke 2014-09-05 4:31 ` Doug Anderson @ 2014-09-08 3:38 ` Addy Ke 2014-09-08 4:15 ` Doug Anderson 2014-09-20 12:19 ` Wolfram Sang 1 sibling, 2 replies; 7+ messages in thread From: Addy Ke @ 2014-09-08 3:38 UTC (permalink / raw) To: linux-arm-kernel I2C_CLKDIV register descripted in the previous version of RK3x chip manual is incorrect. Plus 1 is required. The correct formula: - T(SCL_HIGH) = T(PCLK) * (CLKDIVH + 1) * 8 - T(SCL_LOW) = T(PCLK) * (CLKDIVL + 1) * 8 - (SCL Divsor) = 8 * ((CLKDIVL + 1) + (CLKDIVH + 1)) - SCL = PCLK / (CLK Divsor) It will be updated to the latest version of chip manual. Signed-off-by: Addy Ke <addy.ke@rock-chips.com> --- changes since v1: - make it more cleaner, suggested by Doug Anderson drivers/i2c/busses/i2c-rk3x.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c index e637c32..93cfc83 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -433,12 +433,11 @@ static void rk3x_i2c_set_scl_rate(struct rk3x_i2c *i2c, unsigned long scl_rate) unsigned long i2c_rate = clk_get_rate(i2c->clk); unsigned int div; - /* SCL rate = (clk rate) / (8 * DIV) */ - div = DIV_ROUND_UP(i2c_rate, scl_rate * 8); - - /* The lower and upper half of the CLKDIV reg describe the length of - * SCL low & high periods. */ - div = DIV_ROUND_UP(div, 2); + /* set DIV = DIVH = DIVL + * SCL rate = (clk rate) / (8 * (DIVH + 1 + DIVL + 1)) + * = (clk rate) / (16 * (DIV + 1)) + */ + div = DIV_ROUND_UP(i2c_rate, scl_rate * 16) - 1; i2c_writel(i2c, (div << 16) | (div & 0xffff), REG_CLKDIV); } -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2] i2c: rk3x: fix divisor calculation for SCL frequency 2014-09-08 3:38 ` [PATCH v2] " Addy Ke @ 2014-09-08 4:15 ` Doug Anderson 2014-09-20 12:19 ` Wolfram Sang 1 sibling, 0 replies; 7+ messages in thread From: Doug Anderson @ 2014-09-08 4:15 UTC (permalink / raw) To: linux-arm-kernel Addy, On Sun, Sep 7, 2014 at 8:38 PM, Addy Ke <addy.ke@rock-chips.com> wrote: > I2C_CLKDIV register descripted in the previous version of > RK3x chip manual is incorrect. Plus 1 is required. > > The correct formula: > - T(SCL_HIGH) = T(PCLK) * (CLKDIVH + 1) * 8 > - T(SCL_LOW) = T(PCLK) * (CLKDIVL + 1) * 8 > - (SCL Divsor) = 8 * ((CLKDIVL + 1) + (CLKDIVH + 1)) > - SCL = PCLK / (CLK Divsor) > > It will be updated to the latest version of chip manual. > > Signed-off-by: Addy Ke <addy.ke@rock-chips.com> > --- > changes since v1: > - make it more cleaner, suggested by Doug Anderson > > drivers/i2c/busses/i2c-rk3x.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) Reviewed-by: Doug Anderson <dianders@chromium.org> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] i2c: rk3x: fix divisor calculation for SCL frequency 2014-09-08 3:38 ` [PATCH v2] " Addy Ke 2014-09-08 4:15 ` Doug Anderson @ 2014-09-20 12:19 ` Wolfram Sang 1 sibling, 0 replies; 7+ messages in thread From: Wolfram Sang @ 2014-09-20 12:19 UTC (permalink / raw) To: linux-arm-kernel On Mon, Sep 08, 2014 at 11:38:25AM +0800, Addy Ke wrote: > I2C_CLKDIV register descripted in the previous version of > RK3x chip manual is incorrect. Plus 1 is required. > > The correct formula: > - T(SCL_HIGH) = T(PCLK) * (CLKDIVH + 1) * 8 > - T(SCL_LOW) = T(PCLK) * (CLKDIVL + 1) * 8 > - (SCL Divsor) = 8 * ((CLKDIVL + 1) + (CLKDIVH + 1)) > - SCL = PCLK / (CLK Divsor) > > It will be updated to the latest version of chip manual. > > Signed-off-by: Addy Ke <addy.ke@rock-chips.com> Applied to for-next, thanks! -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140920/133ac9df/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-09-20 12:19 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-09-05 2:32 [PATCH] i2c: rk3x: fix divisor calculation for SCL frequency Addy Ke 2014-09-05 4:31 ` Doug Anderson 2014-09-05 10:17 ` addy ke 2014-09-05 15:20 ` Doug Anderson 2014-09-08 3:38 ` [PATCH v2] " Addy Ke 2014-09-08 4:15 ` Doug Anderson 2014-09-20 12:19 ` Wolfram Sang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).