diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2011-10-03 03:30:20 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2011-10-03 03:34:16 -0400 |
commit | b1e3be0647fec81887e55edbda0c56c0445f7b53 (patch) | |
tree | f45cf420afccc005b46bb24d4fc3e731b9d434ae /drivers/clocksource/clksrc-dbx500-prcmu.c | |
parent | bb219dba0d1e46324ea462ba42f6fd8e9b7471de (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>
Diffstat (limited to 'drivers/clocksource/clksrc-dbx500-prcmu.c')
-rw-r--r-- | drivers/clocksource/clksrc-dbx500-prcmu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index 0ac5093a053a..59feefe0e3e6 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | #define SCHED_CLOCK_MIN_WRAP 131072 /* 2^32 / 32768 */ | 32 | #define SCHED_CLOCK_MIN_WRAP 131072 /* 2^32 / 32768 */ |
33 | 33 | ||
34 | void __iomem *clksrc_dbx500_timer_base; | 34 | static void __iomem *clksrc_dbx500_timer_base; |
35 | 35 | ||
36 | static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs) | 36 | static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs) |
37 | { | 37 | { |
@@ -79,8 +79,10 @@ static void notrace clksrc_dbx500_prcmu_update_sched_clock(void) | |||
79 | } | 79 | } |
80 | #endif | 80 | #endif |
81 | 81 | ||
82 | void __init clksrc_dbx500_prcmu_init(void) | 82 | void __init clksrc_dbx500_prcmu_init(void __iomem *base) |
83 | { | 83 | { |
84 | clksrc_dbx500_timer_base = base; | ||
85 | |||
84 | /* | 86 | /* |
85 | * The A9 sub system expects the timer to be configured as | 87 | * The A9 sub system expects the timer to be configured as |
86 | * a continous looping timer. | 88 | * a continous looping timer. |