aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-08 14:40:59 -0500
committerStephen Warren <swarren@nvidia.com>2012-12-24 11:36:38 -0500
commit6bb27d7349db51b50c40534710fe164ca0d58902 (patch)
tree8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-s5pv210
parent7704c095230e2e9863f3aacd0489a4b4cc00bf45 (diff)
ARM: delete struct sys_timer
Now that the only field in struct sys_timer is .init, delete the struct, and replace the machine descriptor .timer field with the initialization function itself. This will enable moving timer drivers into drivers/clocksource without having to place a public prototype of each struct sys_timer object into include/linux; the intent is to create a single of_clocksource_init() function that determines which timer driver to initialize by scanning the device dtree, much like the proposed irqchip_init() at: http://www.spinics.net/lists/arm-kernel/msg203686.html Includes mach-omap2 fixes from Igor Grinberg. Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/mach-aquila.c2
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c2
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkc110.c2
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkv210.c2
-rw-r--r--arch/arm/mach-s5pv210/mach-torbreck.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index ee9fa5c2ef2c..1fb44a5ebb83 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -688,6 +688,6 @@ MACHINE_START(AQUILA, "Aquila")
688 .handle_irq = vic_handle_irq, 688 .handle_irq = vic_handle_irq,
689 .map_io = aquila_map_io, 689 .map_io = aquila_map_io,
690 .init_machine = aquila_machine_init, 690 .init_machine = aquila_machine_init,
691 .timer = &s5p_timer, 691 .init_time = s5p_timer_init,
692 .restart = s5pv210_restart, 692 .restart = s5pv210_restart,
693MACHINE_END 693MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index c72b31078c99..ababdca2b3e4 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -975,7 +975,7 @@ MACHINE_START(GONI, "GONI")
975 .handle_irq = vic_handle_irq, 975 .handle_irq = vic_handle_irq,
976 .map_io = goni_map_io, 976 .map_io = goni_map_io,
977 .init_machine = goni_machine_init, 977 .init_machine = goni_machine_init,
978 .timer = &s5p_timer, 978 .init_time = s5p_timer_init,
979 .reserve = &goni_reserve, 979 .reserve = &goni_reserve,
980 .restart = s5pv210_restart, 980 .restart = s5pv210_restart,
981MACHINE_END 981MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index f1f3bd37ecda..acfb0ebce13b 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -155,7 +155,7 @@ MACHINE_START(SMDKC110, "SMDKC110")
155 .handle_irq = vic_handle_irq, 155 .handle_irq = vic_handle_irq,
156 .map_io = smdkc110_map_io, 156 .map_io = smdkc110_map_io,
157 .init_machine = smdkc110_machine_init, 157 .init_machine = smdkc110_machine_init,
158 .timer = &s5p_timer, 158 .init_time = s5p_timer_init,
159 .restart = s5pv210_restart, 159 .restart = s5pv210_restart,
160 .reserve = &smdkc110_reserve, 160 .reserve = &smdkc110_reserve,
161MACHINE_END 161MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 6bc8404bf678..e1d820f3b426 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -331,7 +331,7 @@ MACHINE_START(SMDKV210, "SMDKV210")
331 .handle_irq = vic_handle_irq, 331 .handle_irq = vic_handle_irq,
332 .map_io = smdkv210_map_io, 332 .map_io = smdkv210_map_io,
333 .init_machine = smdkv210_machine_init, 333 .init_machine = smdkv210_machine_init,
334 .timer = &s5p_timer, 334 .init_time = s5p_timer_init,
335 .restart = s5pv210_restart, 335 .restart = s5pv210_restart,
336 .reserve = &smdkv210_reserve, 336 .reserve = &smdkv210_reserve,
337MACHINE_END 337MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c
index 18785cb5e1ef..1e6fc6eccdf3 100644
--- a/arch/arm/mach-s5pv210/mach-torbreck.c
+++ b/arch/arm/mach-s5pv210/mach-torbreck.c
@@ -132,6 +132,6 @@ MACHINE_START(TORBRECK, "TORBRECK")
132 .handle_irq = vic_handle_irq, 132 .handle_irq = vic_handle_irq,
133 .map_io = torbreck_map_io, 133 .map_io = torbreck_map_io,
134 .init_machine = torbreck_machine_init, 134 .init_machine = torbreck_machine_init,
135 .timer = &s5p_timer, 135 .init_time = s5p_timer_init,
136 .restart = s5pv210_restart, 136 .restart = s5pv210_restart,
137MACHINE_END 137MACHINE_END