diff options
| author | Ajay Nandakumar <anandakumarm@nvidia.com> | 2013-10-15 16:55:17 +0530 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2013-10-17 04:19:45 -0700 |
| commit | 03e4bf9837caa59a86db5926a5228b17c1a4252e (patch) | |
| tree | 7dfe7b3b15bcfe65b8720b425d4e149603bae089 /arch/arm/mach-ux500 | |
| parent | 45a9c2aba5a00c408ea6edf131e3dea06665d261 (diff) | |
Revert "Revert "ARM: smp_twd: convert to use CLKSRC_OF init""
This reverts commit ddb49eadadb47df43a5cec0bc3a39cd5ee718121.
Now that we have OF based init with CLKSRC_OF, convert smp_twd init
function to use it and covert all callers of
twd_local_timer_of_register.
Bug 1379817
Change-Id: Ie0bad574361f805081fc050a91e1e3a60513da2d
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/299479
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 290b9c5e5e28..b6bd0efcbe64 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -7,6 +7,7 @@ #include <linux/io.h> #include <linux/errno.h> #include <linux/clksrc-dbx500-prcmu.h> +#include <linux/clocksource.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/platform_data/clocksource-nomadik-mtu.h> @@ -32,7 +33,7 @@ static void __init ux500_twd_init(void) twd_local_timer = &u8500_twd_local_timer; if (of_have_populated_dt()) - twd_local_timer_of_register(); + clocksource_of_init(); else { err = twd_local_timer_register(twd_local_timer); if (err) |