X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-integrator%2Fintegrator_cp.c;h=f63e45cbe8fa90757c7d6b7ecec5fb157169b8fd;hb=9c920a8402f2bb9bd931801d429b65f4eb6a262b;hp=e56fcb1ea8ad5f72db3c74568a67ae6c01b86895;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index e56fcb1ea..f63e45cbe 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -249,7 +249,7 @@ static struct clk cp_clcd_clk = {
 
 static struct clk cp_mmci_clk = {
 	.name	= "MCLK",
-	.rate	= 14745600,
+	.rate	= 33000000,
 };
 
 /*
@@ -351,6 +351,7 @@ static unsigned int mmc_status(struct device *dev)
 }
 
 static struct mmc_platform_data mmc_data = {
+	.mclk		= 33000000,
 	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,
 	.status		= mmc_status,
 };
@@ -418,19 +419,11 @@ static void __init intcp_init(void)
 	}
 }
 
-#define TIMER_CTRL_IE	(1 << 5)			/* Interrupt Enable */
-
-static void __init intcp_init_time(void)
-{
-	integrator_time_init(1000000 / HZ, TIMER_CTRL_IE);
-}
-
 MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
 	MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
 	BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
 	BOOT_PARAMS(0x00000100)
 	MAPIO(intcp_map_io)
 	INITIRQ(intcp_init_irq)
-	INITTIME(intcp_init_time)
 	INIT_MACHINE(intcp_init)
 MACHINE_END