Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic',...

[sfrench/cifs-2.6.git] / arch / arm / mach-realview / core.c

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index c8ec0888663395d2609b6abd0bce55f7be464e67..5c23450d2d1d40af01462bd4d765b49cc14e5845 100644 (file)
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -56,25 +56,6 @@
 
 #include "core.h"
 
-#ifdef CONFIG_ZONE_DMA
-/*
- * Adjust the zones if there are restrictions for DMA access.
- */
-void __init realview_adjust_zones(unsigned long *size, unsigned long *hole)
-{
-       unsigned long dma_size = SZ_256M >> PAGE_SHIFT;
-
-       if (!machine_is_realview_pbx() || size[0] <= dma_size)
-               return;
-
-       size[ZONE_NORMAL] = size[0] - dma_size;
-       size[ZONE_DMA] = dma_size;
-       hole[ZONE_NORMAL] = hole[0];
-       hole[ZONE_DMA] = 0;
-}
-#endif
-
-
 #define REALVIEW_FLASHCTRL    (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_FLASH_OFFSET)
 
 static void realview_flash_set_vpp(struct platform_device *pdev, int on)
@@ -292,6 +273,10 @@ static struct clk ref24_clk = {
        .rate   = 24000000,
 };
 
+static struct clk sp804_clk = {
+       .rate   = 1000000,
+};
+
 static struct clk dummy_apb_pclk;
 
 static struct clk_lookup lookups[] = {
@@ -334,7 +319,10 @@ static struct clk_lookup lookups[] = {
        }, {    /* SSP */
                .dev_id         = "dev:ssp0",
                .clk            = &ref24_clk,
-       }
+       }, {    /* SP804 timers */
+               .dev_id         = "sp804",
+               .clk            = &sp804_clk,
+       },
 };
 
 void __init realview_init_early(void)
@@ -522,8 +510,8 @@ void __init realview_timer_init(unsigned int timer_irq)
        writel(0, timer2_va_base + TIMER_CTRL);
        writel(0, timer3_va_base + TIMER_CTRL);
 
-       sp804_clocksource_init(timer3_va_base);
-       sp804_clockevents_init(timer0_va_base, timer_irq);
+       sp804_clocksource_init(timer3_va_base, "timer3");
+       sp804_clockevents_init(timer0_va_base, timer_irq, "timer0");
 }
 
 /*