| Message ID | 1314701474-27854-2-git-send-email-sbabic@denx.de |
|---|---|
| State | Accepted |
| Commit | 30032710ed7259800cc4dbcba8741fef65e56186 |
| Headers | show |
Hello Stefano, Stefano Babic wrote: > Signed-off-by: Stefano Babic <sbabic@denx.de> > CC: Heiko Schocher <hs@denx.de> > --- > drivers/i2c/mxc_i2c.c | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) As this patch is in a patchseries, I give you my: Acked-by: Heiko Schocher <hs@denx.de> Thanks for fixing this! bye, Heiko
On 09/02/2011 07:50 AM, Heiko Schocher wrote: > Hello Stefano, > > Stefano Babic wrote: >> Signed-off-by: Stefano Babic <sbabic@denx.de> >> CC: Heiko Schocher <hs@denx.de> >> --- >> drivers/i2c/mxc_i2c.c | 5 +---- >> 1 files changed, 1 insertions(+), 4 deletions(-) > > As this patch is in a patchseries, I give you my: > > Acked-by: Heiko Schocher <hs@denx.de> Heiko, is it ok for you if I merge this patch directly into u-boot-imx ? It is part of a series to fix the remaining broken IMX boards. Stefano
Hello Stefano, Stefano Babic wrote: > On 09/02/2011 07:50 AM, Heiko Schocher wrote: >> Hello Stefano, >> >> Stefano Babic wrote: >>> Signed-off-by: Stefano Babic <sbabic@denx.de> >>> CC: Heiko Schocher <hs@denx.de> >>> --- >>> drivers/i2c/mxc_i2c.c | 5 +---- >>> 1 files changed, 1 insertions(+), 4 deletions(-) >> As this patch is in a patchseries, I give you my: >> >> Acked-by: Heiko Schocher <hs@denx.de> > > Heiko, > > is it ok for you if I merge this patch directly into u-boot-imx ? It is > part of a series to fix the remaining broken IMX boards. Yep! This was my intention when Acking this patch ;-) bye, Heiko
Dear Stefano Babic, In message <1314701474-27854-2-git-send-email-sbabic@denx.de> you wrote: > Signed-off-by: Stefano Babic <sbabic@denx.de> > CC: Heiko Schocher <hs@denx.de> > --- > drivers/i2c/mxc_i2c.c | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 89d1973..ebde3c5 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -89,14 +89,11 @@ void i2c_init(int speed, int unused) #if defined(CONFIG_MX31) struct clock_control_regs *sc_regs = (struct clock_control_regs *)CCM_BASE; - - freq = mx31_get_ipg_clk(); /* start the required I2C clock */ writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET), &sc_regs->cgr0); -#else - freq = mxc_get_clock(MXC_IPG_PERCLK); #endif + freq = mxc_get_clock(MXC_IPG_PERCLK); for (i = 0; i < 0x1f; i++) if (freq / div[i] <= speed)
Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Heiko Schocher <hs@denx.de> --- drivers/i2c/mxc_i2c.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)