diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 14:40:59 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 11:36:38 -0500 |
commit | 6bb27d7349db51b50c40534710fe164ca0d58902 (patch) | |
tree | 8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-mmp/pxa910.c | |
parent | 7704c095230e2e9863f3aacd0489a4b4cc00bf45 (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-mmp/pxa910.c')
-rw-r--r-- | arch/arm/mach-mmp/pxa910.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index 8b1e16fbb7a5..c6a89f1eca4e 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c | |||
@@ -101,7 +101,7 @@ postcore_initcall(pxa910_init); | |||
101 | #define TIMER_CLK_RST (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(3)) | 101 | #define TIMER_CLK_RST (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(3)) |
102 | #define APBC_TIMERS APBC_REG(0x34) | 102 | #define APBC_TIMERS APBC_REG(0x34) |
103 | 103 | ||
104 | static void __init pxa910_timer_init(void) | 104 | void __init pxa910_timer_init(void) |
105 | { | 105 | { |
106 | /* reset and configure */ | 106 | /* reset and configure */ |
107 | __raw_writel(APBC_APBCLK | APBC_RST, APBC_TIMERS); | 107 | __raw_writel(APBC_APBCLK | APBC_RST, APBC_TIMERS); |
@@ -110,10 +110,6 @@ static void __init pxa910_timer_init(void) | |||
110 | timer_init(IRQ_PXA910_AP1_TIMER1); | 110 | timer_init(IRQ_PXA910_AP1_TIMER1); |
111 | } | 111 | } |
112 | 112 | ||
113 | struct sys_timer pxa910_timer = { | ||
114 | .init = pxa910_timer_init, | ||
115 | }; | ||
116 | |||
117 | /* on-chip devices */ | 113 | /* on-chip devices */ |
118 | 114 | ||
119 | /* NOTE: there are totally 3 UARTs on PXA910: | 115 | /* NOTE: there are totally 3 UARTs on PXA910: |