diff options
Diffstat (limited to 'arch/arm/mach-realview/realview_pbx.c')
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 3f2f605624e9..5d2c8bebb069 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c | |||
@@ -26,11 +26,11 @@ | |||
26 | #include <linux/amba/mmci.h> | 26 | #include <linux/amba/mmci.h> |
27 | #include <linux/amba/pl022.h> | 27 | #include <linux/amba/pl022.h> |
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | #include <linux/platform_data/clk-realview.h> | ||
29 | 30 | ||
30 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
31 | #include <asm/leds.h> | 32 | #include <asm/leds.h> |
32 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
33 | #include <asm/pmu.h> | ||
34 | #include <asm/smp_twd.h> | 34 | #include <asm/smp_twd.h> |
35 | #include <asm/pgtable.h> | 35 | #include <asm/pgtable.h> |
36 | #include <asm/hardware/gic.h> | 36 | #include <asm/hardware/gic.h> |
@@ -280,7 +280,7 @@ static struct resource pmu_resources[] = { | |||
280 | 280 | ||
281 | static struct platform_device pmu_device = { | 281 | static struct platform_device pmu_device = { |
282 | .name = "arm-pmu", | 282 | .name = "arm-pmu", |
283 | .id = ARM_PMU_DEVICE_CPU, | 283 | .id = -1, |
284 | .num_resources = ARRAY_SIZE(pmu_resources), | 284 | .num_resources = ARRAY_SIZE(pmu_resources), |
285 | .resource = pmu_resources, | 285 | .resource = pmu_resources, |
286 | }; | 286 | }; |
@@ -320,6 +320,7 @@ static void __init realview_pbx_timer_init(void) | |||
320 | timer2_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE); | 320 | timer2_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE); |
321 | timer3_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE) + 0x20; | 321 | timer3_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE) + 0x20; |
322 | 322 | ||
323 | realview_clk_init(__io_address(REALVIEW_SYS_BASE), false); | ||
323 | realview_timer_init(IRQ_PBX_TIMER0_1); | 324 | realview_timer_init(IRQ_PBX_TIMER0_1); |
324 | realview_pbx_twd_init(); | 325 | realview_pbx_twd_init(); |
325 | } | 326 | } |