[U-Boot] [PATCH 1/2] MX31: fix missing mxc_get_clk() call
Add missing case to be used in common MXC code.
Signed-off-by: Stefano Babic sbabic@denx.de --- arch/arm/cpu/arm1136/mx31/generic.c | 1 + arch/arm/include/asm/arch-mx31/clock.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index 248431b..e3a4d1b 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -85,6 +85,7 @@ unsigned int mxc_get_clock(enum mxc_clock clk) case MXC_ARM_CLK: return mx31_get_mcu_main_clk(); case MXC_IPG_CLK: + case MXC_IPG_PERCLK: case MXC_CSPI_CLK: case MXC_UART_CLK: return mx31_get_ipg_clk(); diff --git a/arch/arm/include/asm/arch-mx31/clock.h b/arch/arm/include/asm/arch-mx31/clock.h index b132676..cc99a75 100644 --- a/arch/arm/include/asm/arch-mx31/clock.h +++ b/arch/arm/include/asm/arch-mx31/clock.h @@ -27,6 +27,7 @@ enum mxc_clock { MXC_ARM_CLK, MXC_IPG_CLK, + MXC_IPG_PERCLK, MXC_CSPI_CLK, MXC_UART_CLK, };
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(-)
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)
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
Dear Stefano Babic,
In message 1314701474-27854-1-git-send-email-sbabic@denx.de you wrote:
Add missing case to be used in common MXC code.
Signed-off-by: Stefano Babic sbabic@denx.de
arch/arm/cpu/arm1136/mx31/generic.c | 1 + arch/arm/include/asm/arch-mx31/clock.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (3)
-
Heiko Schocher -
Stefano Babic -
Wolfgang Denk