diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2011-10-03 09:30:20 +0200 |
---|---|---|
committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-10-18 13:04:04 +0200 |
commit | e3203ad3659008d8d25b4006a9e0917d42bc3f13 (patch) | |
tree | 9f099f2cf32918ca75ec69b50f4618aec9146b1a /arch/arm | |
parent | 4e200f9409e9015889177197c3ff4f577b7cb724 (diff) |
clocksource: fixup ux500 build problems
Based on a patch from Arnd Bergmann this fixes up the build
problem of assigning a non-existing global when the ux500 PRCMU
timer is not linked in by passing its base address to the init
function. We also add a missing <linux/errno.h> inclusion and
staticize the dummy function.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
ST-Ericsson ID: 368260
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I87ec2eb27e157433fa12fb4eafc165a6217a869b
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34327
Reviewed-by: QATOOLS
Tested-by: Rabin VINCENT <rabin.vincent@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ux500/timer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 8a8f747bd81..c395f5c8992 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -5,6 +5,7 @@ * Author: Mattias Wallin <mattias.wallin@stericsson.com> for ST-Ericsson */ #include <linux/io.h> +#include <linux/errno.h> #include <linux/clksrc-dbx500-prcmu.h> #include <asm/localtimer.h> @@ -36,18 +37,20 @@ static void ux500_timer_reset(void) static void __init ux500_timer_init(void) { + void __iomem *prcmu_timer_base; + if (cpu_is_u5500()) { #ifdef CONFIG_LOCAL_TIMERS twd_base = __io_address(U5500_TWD_BASE); #endif mtu_base = __io_address(U5500_MTU0_BASE); - clksrc_dbx500_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE); + prcmu_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE); } else if (cpu_is_u8500()) { #ifdef CONFIG_LOCAL_TIMERS twd_base = __io_address(U8500_TWD_BASE); #endif mtu_base = __io_address(U8500_MTU0_BASE); - clksrc_dbx500_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); + prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); } else { ux500_unknown_soc(); } @@ -70,7 +73,7 @@ static void __init ux500_timer_init(void) */ nmdk_timer_init(); - clksrc_dbx500_prcmu_init(); + clksrc_dbx500_prcmu_init(prcmu_timer_base); #ifdef CONFIG_UX500_CONTEXT WARN_ON(context_ape_notifier_register(&mtu_context_notifier)); |