aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress/ct-ca9x4.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-vexpress/ct-ca9x4.c')
-rw-r--r--arch/arm/mach-vexpress/ct-ca9x4.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index efb127022d4..c2e405a9e02 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -68,7 +68,7 @@ static void __init ct_ca9x4_init_irq(void)
68} 68}
69 69
70#if 0 70#if 0
71static void ct_ca9x4_timer_init(void) 71static void __init ct_ca9x4_timer_init(void)
72{ 72{
73 writel(0, MMIO_P2V(CT_CA9X4_TIMER0) + TIMER_CTRL); 73 writel(0, MMIO_P2V(CT_CA9X4_TIMER0) + TIMER_CTRL);
74 writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL); 74 writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL);
@@ -222,7 +222,7 @@ static struct platform_device pmu_device = {
222 .resource = pmu_resources, 222 .resource = pmu_resources,
223}; 223};
224 224
225static void ct_ca9x4_init(void) 225static void __init ct_ca9x4_init(void)
226{ 226{
227 int i; 227 int i;
228 228
@@ -245,8 +245,6 @@ static void ct_ca9x4_init(void)
245} 245}
246 246
247MACHINE_START(VEXPRESS, "ARM-Versatile Express CA9x4") 247MACHINE_START(VEXPRESS, "ARM-Versatile Express CA9x4")
248 .phys_io = V2M_UART0 & SECTION_MASK,
249 .io_pg_offst = (__MMIO_P2V(V2M_UART0) >> 18) & 0xfffc,
250 .boot_params = PHYS_OFFSET + 0x00000100, 248 .boot_params = PHYS_OFFSET + 0x00000100,
251 .map_io = ct_ca9x4_map_io, 249 .map_io = ct_ca9x4_map_io,
252 .init_irq = ct_ca9x4_init_irq, 250 .init_irq = ct_ca9x4_init_irq,