From: vaibhav.hiremath@linaro.org (Vaibhav Hiremath) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH-V2 11/12] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Date: Mon, 15 Jun 2015 21:19:58 +0530 [thread overview] Message-ID: <1434383399-2370-12-git-send-email-vaibhav.hiremath@linaro.org> (raw) In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath@linaro.org> With addition of PXA910 family of devices, the TWSI module supports SCL clock adjustment using ILCR register. This patch enables the control and configuration of ICLR through DT properties, i2c-sclk-high-time-ns: SCLK high time (tHigh), for standard/fast/high speed mode i2c-sclk-low-time-ns: SCLK low time (tLow), for standard/fast/high speed mode Note that in case of standard and fast mod, the tLow and tHigh counters are same, and software will use tLow value. Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org> Signed-off-by: Jett.Zhou <jtzhou@marvell.com> Signed-off-by: Yi Zhang <yizhang@marvell.com> --- drivers/i2c/busses/i2c-pxa.c | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 97f9c7c..03b70f8 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -195,6 +195,9 @@ struct pxa_i2c { unsigned long rate; bool highmode_enter; bool disable_after_xfer; + + unsigned int sclk_thigh_load_cnt; + unsigned int sclk_tlow_load_cnt; }; #define _IBMR(i2c) ((i2c)->reg_ibmr) @@ -507,6 +510,33 @@ static void i2c_pxa_set_slave(struct pxa_i2c *i2c, int errcode) #define i2c_pxa_set_slave(i2c, err) do { } while (0) #endif +static void i2c_pxa_do_sclk_adj(struct pxa_i2c *i2c) +{ + unsigned int reg_ilcr; + + reg_ilcr = readl(_ILCR(i2c)); + + /* For standard/fast mode tlow and thigh counters are same */ + if (i2c->sclk_tlow_load_cnt) { + unsigned int mask, shift; + + mask = i2c->high_mode ? ILCR_HLVL_MASK : + i2c->fast_mode ? ILCR_FLV_MASK : ILCR_SLV_MASK; + shift = i2c->high_mode ? ILCR_HLVL_SHIFT : + i2c->fast_mode ? ILCR_FLV_SHIFT : ILCR_SLV_SHIFT; + + reg_ilcr &= ~mask; + reg_ilcr |= i2c->sclk_tlow_load_cnt << shift; + } + + if (i2c->high_mode && i2c->sclk_thigh_load_cnt) { + reg_ilcr &= ~ILCR_HLVH_MASK; + reg_ilcr |= i2c->sclk_thigh_load_cnt << ILCR_HLVH_SHIFT; + } + + writel(reg_ilcr, _ILCR(i2c)); +} + static void i2c_pxa_reset(struct pxa_i2c *i2c) { pr_debug("Resetting I2C Controller Unit\n"); @@ -526,6 +556,8 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c) writel(I2C_ICR_INIT | (i2c->fast_mode ? ICR_FM : 0), _ICR(i2c)); writel(readl(_ICR(i2c)) | (i2c->high_mode ? ICR_HS : 0), _ICR(i2c)); + i2c_pxa_do_sclk_adj(i2c); + #ifdef CONFIG_I2C_PXA_SLAVE dev_info(&i2c->adap.dev, "Enabling slave mode\n"); writel(readl(_ICR(i2c)) | ICR_SADIE | ICR_ALDIE | ICR_SSDIE, _ICR(i2c)); @@ -1204,6 +1236,26 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, *i2c_types = (long)(of_id->data); + /* optional properties */ + if (of_device_is_compatible(np, "mrvl,mmp-twsi")) { + unsigned int tlow = 0, thigh = 0; + unsigned int clk_ns; + + /* clock time in nsec */ + clk_ns = 1000000 / (i2c->rate / 1000); + + of_property_read_u32(np, "i2c-sclk-high-time-ns", &thigh); + i2c->sclk_thigh_load_cnt = thigh / clk_ns; + + of_property_read_u32(np, "i2c-sclk-low-time-ns", &tlow); + i2c->sclk_tlow_load_cnt = tlow / clk_ns; + + /* For std/fast mode tlow & thigh have same bit-fields */ + if (!i2c->high_mode && + (i2c->sclk_tlow_load_cnt != i2c->sclk_thigh_load_cnt)) + dev_warn(&i2c->adap.dev, + "mismatch of tLow & tHigh values, using tLow\n"); + } return 0; } @@ -1253,6 +1305,14 @@ static int i2c_pxa_probe(struct platform_device *dev) return irq; } + i2c->clk = devm_clk_get(&dev->dev, NULL); + if (IS_ERR(i2c->clk)) { + dev_err(&dev->dev, "failed to get the clk\n"); + return PTR_ERR(i2c->clk); + } + + i2c->rate = clk_get_rate(i2c->clk); + /* Default adapter num to device id; i2c_pxa_probe_dt can override. */ i2c->adap.nr = dev->id; @@ -1270,12 +1330,6 @@ static int i2c_pxa_probe(struct platform_device *dev) strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name)); - i2c->clk = devm_clk_get(&dev->dev, NULL); - if (IS_ERR(i2c->clk)) { - dev_err(&dev->dev, "failed to get the clk\n"); - return PTR_ERR(i2c->clk); - } - i2c->reg_base = devm_ioremap_resource(&dev->dev, res); if (IS_ERR(i2c->reg_base)) { dev_err(&dev->dev, "failed to map resource: %ld\n", -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org, robert.jarzmik-GANU6spQydw@public.gmane.org, Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, "Jett.Zhou" <jtzhou-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Yi Zhang <yizhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Subject: [PATCH-V2 11/12] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Date: Mon, 15 Jun 2015 21:19:58 +0530 [thread overview] Message-ID: <1434383399-2370-12-git-send-email-vaibhav.hiremath@linaro.org> (raw) In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> With addition of PXA910 family of devices, the TWSI module supports SCL clock adjustment using ILCR register. This patch enables the control and configuration of ICLR through DT properties, i2c-sclk-high-time-ns: SCLK high time (tHigh), for standard/fast/high speed mode i2c-sclk-low-time-ns: SCLK low time (tLow), for standard/fast/high speed mode Note that in case of standard and fast mod, the tLow and tHigh counters are same, and software will use tLow value. Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Signed-off-by: Jett.Zhou <jtzhou-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Yi Zhang <yizhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> --- drivers/i2c/busses/i2c-pxa.c | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 97f9c7c..03b70f8 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -195,6 +195,9 @@ struct pxa_i2c { unsigned long rate; bool highmode_enter; bool disable_after_xfer; + + unsigned int sclk_thigh_load_cnt; + unsigned int sclk_tlow_load_cnt; }; #define _IBMR(i2c) ((i2c)->reg_ibmr) @@ -507,6 +510,33 @@ static void i2c_pxa_set_slave(struct pxa_i2c *i2c, int errcode) #define i2c_pxa_set_slave(i2c, err) do { } while (0) #endif +static void i2c_pxa_do_sclk_adj(struct pxa_i2c *i2c) +{ + unsigned int reg_ilcr; + + reg_ilcr = readl(_ILCR(i2c)); + + /* For standard/fast mode tlow and thigh counters are same */ + if (i2c->sclk_tlow_load_cnt) { + unsigned int mask, shift; + + mask = i2c->high_mode ? ILCR_HLVL_MASK : + i2c->fast_mode ? ILCR_FLV_MASK : ILCR_SLV_MASK; + shift = i2c->high_mode ? ILCR_HLVL_SHIFT : + i2c->fast_mode ? ILCR_FLV_SHIFT : ILCR_SLV_SHIFT; + + reg_ilcr &= ~mask; + reg_ilcr |= i2c->sclk_tlow_load_cnt << shift; + } + + if (i2c->high_mode && i2c->sclk_thigh_load_cnt) { + reg_ilcr &= ~ILCR_HLVH_MASK; + reg_ilcr |= i2c->sclk_thigh_load_cnt << ILCR_HLVH_SHIFT; + } + + writel(reg_ilcr, _ILCR(i2c)); +} + static void i2c_pxa_reset(struct pxa_i2c *i2c) { pr_debug("Resetting I2C Controller Unit\n"); @@ -526,6 +556,8 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c) writel(I2C_ICR_INIT | (i2c->fast_mode ? ICR_FM : 0), _ICR(i2c)); writel(readl(_ICR(i2c)) | (i2c->high_mode ? ICR_HS : 0), _ICR(i2c)); + i2c_pxa_do_sclk_adj(i2c); + #ifdef CONFIG_I2C_PXA_SLAVE dev_info(&i2c->adap.dev, "Enabling slave mode\n"); writel(readl(_ICR(i2c)) | ICR_SADIE | ICR_ALDIE | ICR_SSDIE, _ICR(i2c)); @@ -1204,6 +1236,26 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, *i2c_types = (long)(of_id->data); + /* optional properties */ + if (of_device_is_compatible(np, "mrvl,mmp-twsi")) { + unsigned int tlow = 0, thigh = 0; + unsigned int clk_ns; + + /* clock time in nsec */ + clk_ns = 1000000 / (i2c->rate / 1000); + + of_property_read_u32(np, "i2c-sclk-high-time-ns", &thigh); + i2c->sclk_thigh_load_cnt = thigh / clk_ns; + + of_property_read_u32(np, "i2c-sclk-low-time-ns", &tlow); + i2c->sclk_tlow_load_cnt = tlow / clk_ns; + + /* For std/fast mode tlow & thigh have same bit-fields */ + if (!i2c->high_mode && + (i2c->sclk_tlow_load_cnt != i2c->sclk_thigh_load_cnt)) + dev_warn(&i2c->adap.dev, + "mismatch of tLow & tHigh values, using tLow\n"); + } return 0; } @@ -1253,6 +1305,14 @@ static int i2c_pxa_probe(struct platform_device *dev) return irq; } + i2c->clk = devm_clk_get(&dev->dev, NULL); + if (IS_ERR(i2c->clk)) { + dev_err(&dev->dev, "failed to get the clk\n"); + return PTR_ERR(i2c->clk); + } + + i2c->rate = clk_get_rate(i2c->clk); + /* Default adapter num to device id; i2c_pxa_probe_dt can override. */ i2c->adap.nr = dev->id; @@ -1270,12 +1330,6 @@ static int i2c_pxa_probe(struct platform_device *dev) strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name)); - i2c->clk = devm_clk_get(&dev->dev, NULL); - if (IS_ERR(i2c->clk)) { - dev_err(&dev->dev, "failed to get the clk\n"); - return PTR_ERR(i2c->clk); - } - i2c->reg_base = devm_ioremap_resource(&dev->dev, res); if (IS_ERR(i2c->reg_base)) { dev_err(&dev->dev, "failed to map resource: %ld\n", -- 1.9.1
next prev parent reply other threads:[~2015-06-15 15:49 UTC|newest] Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <vaibhav.hiremath@linaro.org> 2015-06-02 18:45 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath 2015-06-02 18:45 ` [PATCH-RESEND 1/3] i2c: core: append hardware lock with bus lock Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath 2015-06-02 18:45 ` [PATCH-RESEND 2/3] i2c: pxa: Add support for hardware lock Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath 2015-06-02 18:45 ` [PATCH-RESEND 3/3] i2c: pxa: Add pin ctrl support for CP core access Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath 2015-06-16 8:28 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath 2015-06-16 8:28 ` Vaibhav Hiremath 2015-07-07 6:43 ` Vaibhav Hiremath 2015-07-07 6:43 ` Vaibhav Hiremath 2015-10-25 9:52 ` Wolfram Sang 2015-10-25 9:52 ` Wolfram Sang 2015-06-15 15:49 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 01/12] i2c: pxa: keep i2c irq ON in suspend Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 20:58 ` Robert Jarzmik 2015-07-03 20:58 ` Robert Jarzmik 2015-06-15 15:49 ` [PATCH-V2 03/12] i2c: pxa: Return I2C_RETRY when timeout in pio mode Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-16 5:31 ` Shubhrajyoti Datta 2015-06-16 5:31 ` Shubhrajyoti Datta 2015-06-16 7:41 ` Vaibhav Hiremath 2015-06-16 7:41 ` Vaibhav Hiremath 2015-07-03 21:07 ` Robert Jarzmik 2015-07-03 21:07 ` Robert Jarzmik 2015-06-15 15:49 ` [PATCH-V2 04/12] i2c: pxa: Reset i2c controller on timeout in interrupt and " Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 15:27 ` Robert Jarzmik 2015-07-03 15:27 ` Robert Jarzmik 2015-07-03 18:13 ` Vaibhav Hiremath 2015-07-03 18:13 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 05/12] i2c: pxa: Remove compile warnning in 64bit mode Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 06/12] i2c: pxa: Update debug function to dump more info on error Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 07/12] i2c:pxa: Use devm_ variants in probe function Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 18:14 ` Vaibhav Hiremath 2015-07-03 18:14 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 08/12] i2c: pxa: enable/disable i2c module across msg xfer Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 18:23 ` Vaibhav Hiremath 2015-07-03 18:23 ` Vaibhav Hiremath 2015-07-03 18:48 ` Vaibhav Hiremath 2015-07-03 18:48 ` Vaibhav Hiremath 2015-07-03 19:44 ` Robert Jarzmik 2015-07-03 19:44 ` Robert Jarzmik 2015-06-15 15:49 ` [PATCH-V2 09/12] Documentation: binding: add new property 'disable_after_xfer' to i2c-pxa Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 10/12] i2c: pxa: Add support for pxa910/988 & new configuration features Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath [this message] 2015-06-15 15:49 ` [PATCH-V2 11/12] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Vaibhav Hiremath 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 18:17 ` Vaibhav Hiremath 2015-07-03 18:17 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 12/12] Documentation: binding: add sclk adjustment properties to i2c-pxa Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-16 13:22 ` Rob Herring 2015-06-16 13:22 ` Rob Herring 2015-06-16 14:25 ` Vaibhav Hiremath 2015-06-16 14:25 ` Vaibhav Hiremath 2015-06-29 8:52 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath 2015-06-29 8:52 ` Vaibhav Hiremath 2015-07-02 16:54 ` Vaibhav Hiremath 2015-07-02 16:54 ` Vaibhav Hiremath 2015-06-17 18:58 [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2 1/3] mfd: 88pm800: Add device " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2] rtc: 88pm80x: add " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-20 0:43 ` Alexandre Belloni 2015-06-20 0:43 ` Alexandre Belloni 2015-06-20 0:43 ` Alexandre Belloni 2015-06-20 0:43 ` Alexandre Belloni 2015-06-25 7:46 ` Vaibhav Hiremath 2015-06-25 7:46 ` Vaibhav Hiremath 2015-06-25 7:46 ` Vaibhav Hiremath 2015-06-25 7:46 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2 2/3] mfd: 88pm800: Allow configuration of interrupt clear method Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2 3/3] mfd: devicetree: bindings: Add new 88pm800 mfd binding Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-23 15:37 ` Rob Herring 2015-06-23 15:37 ` Rob Herring 2015-06-23 15:37 ` [rtc-linux] " Rob Herring 2015-06-23 15:37 ` Rob Herring 2015-06-23 17:02 ` Vaibhav Hiremath 2015-06-23 17:02 ` Vaibhav Hiremath 2015-06-23 17:02 ` [rtc-linux] " Vaibhav Hiremath 2015-06-24 0:29 ` Krzysztof Kozlowski 2015-06-24 0:29 ` Krzysztof Kozlowski 2015-06-24 0:29 ` [rtc-linux] " Krzysztof Kozlowski 2015-06-24 0:29 ` Krzysztof Kozlowski 2015-06-24 5:19 ` Vaibhav Hiremath 2015-06-24 5:19 ` Vaibhav Hiremath 2015-06-24 5:19 ` [rtc-linux] " Vaibhav Hiremath 2015-06-24 5:19 ` Vaibhav Hiremath 2015-06-23 5:07 ` [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath 2015-06-23 5:07 ` Vaibhav Hiremath 2015-06-23 5:07 ` [rtc-linux] " Vaibhav Hiremath 2015-06-23 5:07 ` Vaibhav Hiremath
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1434383399-2370-12-git-send-email-vaibhav.hiremath@linaro.org \ --to=vaibhav.hiremath@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.