* [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() to mxc_i2c.c
@ 2011-09-27 16:29 Marek Vasut
2011-09-27 16:34 ` [U-Boot] [PATCH V2] I2C: Add i2c_get/set_speed() " Marek Vasut
2011-09-30 13:53 ` [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() " Stefano Babic
0 siblings, 2 replies; 5+ messages in thread
From: Marek Vasut @ 2011-09-27 16:29 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
---
drivers/i2c/mxc_i2c.c | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index a805bf6..e12a08a 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -95,7 +95,7 @@ static u16 i2c_clk_div[50][2] = {
{ 3072, 0x1E }, { 3840, 0x1F }
};
-static u8 clk_idx;
+static u8 clk_div;
/*
* Calculate and set proper clock divider
@@ -105,7 +105,6 @@ static void i2c_imx_set_clk(unsigned int rate)
struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
unsigned int i2c_clk_rate;
unsigned int div;
- int i;
#if defined(CONFIG_MX31)
struct clock_control_regs *sc_regs =
@@ -120,16 +119,15 @@ static void i2c_imx_set_clk(unsigned int rate)
i2c_clk_rate = mxc_get_clock(MXC_IPG_PERCLK);
div = (i2c_clk_rate + rate - 1) / rate;
if (div < i2c_clk_div[0][0])
- i = 0;
+ clk_div = 0;
else if (div > i2c_clk_div[ARRAY_SIZE(i2c_clk_div) - 1][0])
- i = ARRAY_SIZE(i2c_clk_div) - 1;
+ clk_div = ARRAY_SIZE(i2c_clk_div) - 1;
else
- for (i = 0; i2c_clk_div[i][0] < div; i++)
+ for (clk_div = 0; i2c_clk_div[clk_div][0] < div; clk_div++)
;
/* Store divider value */
- clk_idx = i2c_clk_div[i][1];
- writeb(clk_idx, &i2c_regs->ifdr);
+ writeb(i2c_clk_div[clk_div][1], &i2c_regs->ifdr);
}
/*
@@ -153,6 +151,24 @@ void i2c_init(int speed, int unused)
}
/*
+ * Set I2C Speed
+ */
+int i2c_set_bus_speed(unsigned int speed)
+{
+ i2c_init(speed, 0);
+ return 0;
+}
+
+/*
+ * Get I2C Speed
+ */
+unsigned int i2c_get_bus_speed(void)
+{
+ return mxc_get_clock(MXC_IPG_PERCLK) / i2c_clk_div[clk_div][0];
+
+}
+
+/*
* Wait for bus to be busy (or free if for_busy = 0)
*
* for_busy = 1: Wait for IBB to be asserted
@@ -218,7 +234,7 @@ int i2c_imx_start(void)
unsigned int temp = 0;
int result;
- writeb(clk_idx, &i2c_regs->ifdr);
+ writeb(i2c_clk_div[clk_div][1], &i2c_regs->ifdr);
/* Enable I2C controller */
writeb(0, &i2c_regs->i2sr);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH V2] I2C: Add i2c_get/set_speed() to mxc_i2c.c
2011-09-27 16:29 [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() to mxc_i2c.c Marek Vasut
@ 2011-09-27 16:34 ` Marek Vasut
2011-09-30 9:56 ` Heiko Schocher
2011-09-30 13:53 ` [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() " Stefano Babic
1 sibling, 1 reply; 5+ messages in thread
From: Marek Vasut @ 2011-09-27 16:34 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
---
drivers/i2c/mxc_i2c.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
V2: Drop redundant newline
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index a805bf6..2869d7c 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -95,7 +95,7 @@ static u16 i2c_clk_div[50][2] = {
{ 3072, 0x1E }, { 3840, 0x1F }
};
-static u8 clk_idx;
+static u8 clk_div;
/*
* Calculate and set proper clock divider
@@ -105,7 +105,6 @@ static void i2c_imx_set_clk(unsigned int rate)
struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
unsigned int i2c_clk_rate;
unsigned int div;
- int i;
#if defined(CONFIG_MX31)
struct clock_control_regs *sc_regs =
@@ -120,16 +119,15 @@ static void i2c_imx_set_clk(unsigned int rate)
i2c_clk_rate = mxc_get_clock(MXC_IPG_PERCLK);
div = (i2c_clk_rate + rate - 1) / rate;
if (div < i2c_clk_div[0][0])
- i = 0;
+ clk_div = 0;
else if (div > i2c_clk_div[ARRAY_SIZE(i2c_clk_div) - 1][0])
- i = ARRAY_SIZE(i2c_clk_div) - 1;
+ clk_div = ARRAY_SIZE(i2c_clk_div) - 1;
else
- for (i = 0; i2c_clk_div[i][0] < div; i++)
+ for (clk_div = 0; i2c_clk_div[clk_div][0] < div; clk_div++)
;
/* Store divider value */
- clk_idx = i2c_clk_div[i][1];
- writeb(clk_idx, &i2c_regs->ifdr);
+ writeb(i2c_clk_div[clk_div][1], &i2c_regs->ifdr);
}
/*
@@ -153,6 +151,23 @@ void i2c_init(int speed, int unused)
}
/*
+ * Set I2C Speed
+ */
+int i2c_set_bus_speed(unsigned int speed)
+{
+ i2c_init(speed, 0);
+ return 0;
+}
+
+/*
+ * Get I2C Speed
+ */
+unsigned int i2c_get_bus_speed(void)
+{
+ return mxc_get_clock(MXC_IPG_PERCLK) / i2c_clk_div[clk_div][0];
+}
+
+/*
* Wait for bus to be busy (or free if for_busy = 0)
*
* for_busy = 1: Wait for IBB to be asserted
@@ -218,7 +233,7 @@ int i2c_imx_start(void)
unsigned int temp = 0;
int result;
- writeb(clk_idx, &i2c_regs->ifdr);
+ writeb(i2c_clk_div[clk_div][1], &i2c_regs->ifdr);
/* Enable I2C controller */
writeb(0, &i2c_regs->i2sr);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH V2] I2C: Add i2c_get/set_speed() to mxc_i2c.c
2011-09-27 16:34 ` [U-Boot] [PATCH V2] I2C: Add i2c_get/set_speed() " Marek Vasut
@ 2011-09-30 9:56 ` Heiko Schocher
2011-09-30 13:46 ` Stefano Babic
0 siblings, 1 reply; 5+ messages in thread
From: Heiko Schocher @ 2011-09-30 9:56 UTC (permalink / raw)
To: u-boot
Hello Stefano,
Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> ---
> drivers/i2c/mxc_i2c.c | 31 +++++++++++++++++++++++--------
> 1 files changed, 23 insertions(+), 8 deletions(-)
>
> V2: Drop redundant newline
Could you Ack this patch, or do you want to apply it, so
you can add my:
Acked-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH V2] I2C: Add i2c_get/set_speed() to mxc_i2c.c
2011-09-30 9:56 ` Heiko Schocher
@ 2011-09-30 13:46 ` Stefano Babic
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Babic @ 2011-09-30 13:46 UTC (permalink / raw)
To: u-boot
On 09/30/2011 11:56 AM, Heiko Schocher wrote:
> Hello Stefano,
>
> Marek Vasut wrote:
>> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>> Cc: Stefano Babic <sbabic@denx.de>
>> Cc: Heiko Schocher <hs@denx.de>
>> ---
>> drivers/i2c/mxc_i2c.c | 31 +++++++++++++++++++++++--------
>> 1 files changed, 23 insertions(+), 8 deletions(-)
>>
>> V2: Drop redundant newline
>
> Could you Ack this patch, or do you want to apply it, so
> you can add my:
>
> Acked-by: Heiko Schocher <hs@denx.de>
>
Thanks, Heiko - I will apply directly to u-boot-imx.
bye,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() to mxc_i2c.c
2011-09-27 16:29 [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() to mxc_i2c.c Marek Vasut
2011-09-27 16:34 ` [U-Boot] [PATCH V2] I2C: Add i2c_get/set_speed() " Marek Vasut
@ 2011-09-30 13:53 ` Stefano Babic
1 sibling, 0 replies; 5+ messages in thread
From: Stefano Babic @ 2011-09-30 13:53 UTC (permalink / raw)
To: u-boot
On 09/27/2011 06:29 PM, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> ---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-30 13:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-27 16:29 [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() to mxc_i2c.c Marek Vasut
2011-09-27 16:34 ` [U-Boot] [PATCH V2] I2C: Add i2c_get/set_speed() " Marek Vasut
2011-09-30 9:56 ` Heiko Schocher
2011-09-30 13:46 ` Stefano Babic
2011-09-30 13:53 ` [U-Boot] [PATCH] I2C: Add i2c_get/set_bus_speed() " Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox