Skip to contentSkip to conversation

MX31: fix missing mxc_get_clk() call

PATCH New Stefano Babic 3 participants 7 messages Aug 30, 2011 – Sep 7, 2011

Subsystems (3)
Arm (32-bit) Arm i.MX and Layerscape I2C
lore
Share & tools
lore

Stefano Babic

author
#0 lore raw

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 <[email protected]>
---
 arch/arm/cpu/arm1136/mx31/generic.c    |    1 +
 arch/arm/include/asm/arch-mx31/clock.h |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/cpu/arm1136/mx31/generic.c +1 -0
index 248431b..e3a4d1b 100644
@@ -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();
arch/arm/include/asm/arch-mx31/clock.h +1 -0
index b132676..cc99a75 100644
@@ -27,6 +27,7 @@
 enum mxc_clock {
 	MXC_ARM_CLK,
 	MXC_IPG_CLK,
+	MXC_IPG_PERCLK,
 	MXC_CSPI_CLK,
 	MXC_UART_CLK,
 };
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH 2/2 I2C: mxc: fix compilation for MX31

Signed-off-by Stefano Babic <[email protected]>
CC Heiko Schocher <[email protected]>
---
 drivers/i2c/mxc_i2c.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/i2c/mxc_i2c.c +1 -4
index 89d1973..ebde3c5 100644
@@ -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)
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/2 I2C: mxc: fix compilation for MX31

Hello Stefano,

Quoted 5 lines · Stefano Babic
Signed-off-by Stefano Babic <[email protected]>
CC Heiko Schocher <[email protected]>
---
 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 <[email protected]>

Thanks for fixing this!
bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
author
#3 lore raw

PATCH 2/2 I2C: mxc: fix compilation for MX31

Quoted 9 lines · Heiko Schocher

Hello Stefano,

Quoted 5 lines · Stefano Babic
Signed-off-by Stefano Babic <[email protected]>
CC Heiko Schocher <[email protected]>
---
 drivers/i2c/mxc_i2c.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Quoted 3 lines

As this patch is in a patchseries, I give you my:

Acked-by Heiko Schocher <[email protected]>

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

Signature · 5 lines
=====================================================================
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
=====================================================================
#4 lore raw

PATCH 2/2 I2C: mxc: fix compilation for MX31

Hello Stefano,

Quoted 9 lines · Stefano Babic
Quoted 8 lines · Heiko Schocher

Hello Stefano,

Quoted 5 lines · Stefano Babic
Signed-off-by Stefano Babic <[email protected]>
CC Heiko Schocher <[email protected]>
---
 drivers/i2c/mxc_i2c.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Quoted 8 lines
Quoted 3 lines

As this patch is in a patchseries, I give you my:

Acked-by Heiko Schocher <[email protected]>

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

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Applied
#5 lore raw

PATCH 2/2 I2C: mxc: fix compilation for MX31

In reply to Stefano Babic

Dear Stefano Babic,

Quoted 5 lines · In message <[email protected]> you wrote:
Signed-off-by Stefano Babic <[email protected]>
CC Heiko Schocher <[email protected]>
---
 drivers/i2c/mxc_i2c.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"If you want to eat hippopatomus, you've got to pay the  freight."  -
attributed to an IBM guy, about why IBM software uses so much memory
Applied
#6 lore raw

PATCH 1/2 MX31: fix missing mxc_get_clk() call

In reply to Stefano Babic

Dear Stefano Babic,

Quoted 7 lines · In message <[email protected]> you wrote:

Add missing case to be used in common MXC code.

Signed-off-by Stefano Babic <[email protected]>
---
 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

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Program maintenance is an entropy-increasing process,  and  even  its
most skilfull execution only delays the subsidence of the system into
unfixable obsolescence.       - Fred Brooks, "The Mythical Man Month"