diff options
Diffstat (limited to 'arch/arm/mach-realview/realview_eb.c')
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index baf382c5e776..ce7747692c8b 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -27,12 +27,12 @@ | |||
27 | #include <linux/amba/mmci.h> | 27 | #include <linux/amba/mmci.h> |
28 | #include <linux/amba/pl022.h> | 28 | #include <linux/amba/pl022.h> |
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | #include <linux/platform_data/clk-realview.h> | ||
30 | 31 | ||
31 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
32 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
33 | #include <asm/leds.h> | 34 | #include <asm/leds.h> |
34 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
35 | #include <asm/pmu.h> | ||
36 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
37 | #include <asm/hardware/gic.h> | 37 | #include <asm/hardware/gic.h> |
38 | #include <asm/hardware/cache-l2x0.h> | 38 | #include <asm/hardware/cache-l2x0.h> |
@@ -297,7 +297,7 @@ static struct resource pmu_resources[] = { | |||
297 | 297 | ||
298 | static struct platform_device pmu_device = { | 298 | static struct platform_device pmu_device = { |
299 | .name = "arm-pmu", | 299 | .name = "arm-pmu", |
300 | .id = ARM_PMU_DEVICE_CPU, | 300 | .id = -1, |
301 | .num_resources = ARRAY_SIZE(pmu_resources), | 301 | .num_resources = ARRAY_SIZE(pmu_resources), |
302 | .resource = pmu_resources, | 302 | .resource = pmu_resources, |
303 | }; | 303 | }; |
@@ -414,6 +414,7 @@ static void __init realview_eb_timer_init(void) | |||
414 | else | 414 | else |
415 | timer_irq = IRQ_EB_TIMER0_1; | 415 | timer_irq = IRQ_EB_TIMER0_1; |
416 | 416 | ||
417 | realview_clk_init(__io_address(REALVIEW_SYS_BASE), false); | ||
417 | realview_timer_init(timer_irq); | 418 | realview_timer_init(timer_irq); |
418 | realview_eb_twd_init(); | 419 | realview_eb_twd_init(); |
419 | } | 420 | } |