aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/clock.h
diff options
context:
space:
mode:
authorCory Maccarrone <darkstar6262@gmail.com>2009-11-22 13:10:50 -0500
committerTony Lindgren <tony@atomide.com>2009-11-22 13:24:32 -0500
commit490a56652295825e3006f8703d96da2ef6580318 (patch)
tree03cd6a5ac46ddad12a1a57c67d72cdb84c26ce9f /arch/arm/mach-omap1/clock.h
parentd9f5007491e3b6693dd00487981676b6b3005d72 (diff)
omap1: mmc: Add platform init for omap7xx
The MMC mux pins normally used by omap chips in devices.c are different from what is needed by omap7xx chips. This change adds a conditional around the mux setup code to enable the correct mux pins. 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 these changes, it is now possible to initialize and use MMC cards with omap730 and omap850 devices. Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/clock.h')
-rw-r--r--arch/arm/mach-omap1/clock.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h
index 17f874271255..fac921c00bfe 100644
--- a/arch/arm/mach-omap1/clock.h
+++ b/arch/arm/mach-omap1/clock.h
@@ -637,6 +637,18 @@ static struct clk mmc2_ck = {
637 .enable_bit = 20, 637 .enable_bit = 20,
638}; 638};
639 639
640static struct clk mmc3_ck = {
641 .name = "mmc_ck",
642 .id = 2,
643 .ops = &clkops_generic,
644 /* Functional clock is direct from ULPD, interface clock is ARMPER */
645 .parent = &armper_ck.clk,
646 .rate = 48000000,
647 .flags = RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT,
648 .enable_reg = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
649 .enable_bit = 12,
650};
651
640static struct clk virtual_ck_mpu = { 652static struct clk virtual_ck_mpu = {
641 .name = "mpu", 653 .name = "mpu",
642 .ops = &clkops_null, 654 .ops = &clkops_null,