[PATCH] [OMAP7XX] Add missing clocks for MMC

[PATCH] [OMAP7XX] Add missing clocks for MMC

[Cory Maccarrone]

The omap730 and omap850 both use a different clock for the "fck"
clock of the MMC interface than other omap processors based on the
SOFT_REQ_REG, pin 12.  The "ick" clock is the same as that used
by other omap processors.

* Added the missing clock definition as mmc3_ck to clock.h
* Added the clock definition to omap_clks in clock.c
* Added CK_7XX to the mmci-omap.0 "ick" clock already in clock.c

With this change, it is now possible to initialize and use MMC
cards with omap730 and omap850 devices.

Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com>
---
 arch/arm/mach-omap1/clock.c |    3 ++-
 arch/arm/mach-omap1/clock.h |   12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 5f77b83..8ff0a07 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -125,7 +125,8 @@ static struct omap_clk omap_clks[] = {
 	CLK(NULL,	"bclk",		&bclk_1510,	CK_1510 | CK_310),
 	CLK(NULL,	"bclk",		&bclk_16xx,	CK_16XX),
 	CLK("mmci-omap.0", "fck",	&mmc1_ck,	CK_16XX | CK_1510 | CK_310),
-	CLK("mmci-omap.0", "ick",	&armper_ck.clk,	CK_16XX | CK_1510 | CK_310),
+	CLK("mmci-omap.0", "fck",	&mmc3_ck,	CK_7XX),
+	CLK("mmci-omap.0", "ick",	&armper_ck.clk,	CK_16XX | CK_1510 | CK_310
| CK_7XX),
 	CLK("mmci-omap.1", "fck",	&mmc2_ck,	CK_16XX),
 	CLK("mmci-omap.1", "ick",	&armper_ck.clk,	CK_16XX),
 	/* Virtual clocks */
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h
index 17f8742..fac921c 100644
--- a/arch/arm/mach-omap1/clock.h
+++ b/arch/arm/mach-omap1/clock.h
@@ -637,6 +637,18 @@ static struct clk mmc2_ck = {
 	.enable_bit	= 20,
 };

+static struct clk mmc3_ck = {
+	.name		= "mmc_ck",
+	.id		= 2,
+	.ops		= &clkops_generic,
+	/* Functional clock is direct from ULPD, interface clock is ARMPER */
+	.parent		= &armper_ck.clk,
+	.rate		= 48000000,
+	.flags		= RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT,
+	.enable_reg	= OMAP1_IO_ADDRESS(SOFT_REQ_REG),
+	.enable_bit	= 12,
+};
+
 static struct clk virtual_ck_mpu = {
 	.name		= "mpu",
 	.ops		= &clkops_null,
-- 
1.5.6.3

Re: [PATCH] [OMAP7XX] Add missing clocks for MMC

[Tony Lindgren]

* Cory Maccarrone <darkstar6262@gmail.com> [091003 15:09]:
> The omap730 and omap850 both use a different clock for the "fck"
> clock of the MMC interface than other omap processors based on the
> SOFT_REQ_REG, pin 12.  The "ick" clock is the same as that used
> by other omap processors.
> 
> * Added the missing clock definition as mmc3_ck to clock.h
> * Added the clock definition to omap_clks in clock.c
> * Added CK_7XX to the mmci-omap.0 "ick" clock already in clock.c
> 
> With this change, it is now possible to initialize and use MMC
> cards with omap730 and omap850 devices.

Pushing all the 7xx mmc platform init code as a single patch to
for-next today. Can you please check?

The drivers/mmc/host/omap.c patch you need to get merged via
linux-mmc@vger.kernel.org list :)

Tony

Re: [PATCH] [OMAP7XX] Add missing clocks for MMC

[Cory Maccarrone]

On Tue, Nov 10, 2009 at 4:36 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Cory Maccarrone <darkstar6262@gmail.com> [091003 15:09]:
>> The omap730 and omap850 both use a different clock for the "fck"
>> clock of the MMC interface than other omap processors based on the
>> SOFT_REQ_REG, pin 12.  The "ick" clock is the same as that used
>> by other omap processors.
>>
>> * Added the missing clock definition as mmc3_ck to clock.h
>> * Added the clock definition to omap_clks in clock.c
>> * Added CK_7XX to the mmci-omap.0 "ick" clock already in clock.c
>>
>> With this change, it is now possible to initialize and use MMC
>> cards with omap730 and omap850 devices.
>
> Pushing all the 7xx mmc platform init code as a single patch to
> for-next today. Can you please check?
>
> The drivers/mmc/host/omap.c patch you need to get merged via
> linux-mmc@vger.kernel.org list :)
>
> Tony
>

MMC code is good.  With the additions of the omap.c patch and board
support, MMC works beautifully.

I'll go ahead and repost that patch to linux-mmc, thanks for the tip.

Cory
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html