diff options
author | Arnd Bergmann | 2015-12-18 17:07:52 +0100 |
---|---|---|
committer | Arnd Bergmann | 2015-12-18 17:07:52 +0100 |
commit | 11c7a6c5a3232e2ff1127d80d609daa95df5d5d4 (patch) | |
tree | 52a7bfe7994eb7f0c9d4b9301ad3c27f9bb9ad71 /drivers/clocksource/clksrc-dbx500-prcmu.c | |
parent | ARM: realview: build realview-dt SMP support only when used (diff) | |
parent | ARM: use "depends on" for SoC configs instead of "if" after prompt (diff) | |
download | kernel-qcow2-linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.tar.gz kernel-qcow2-linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.tar.xz kernel-qcow2-linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.zip |
Merge branch 'treewide/cleanup' into next/multiplatform
The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.
* treewide/cleanup:
ARM: use "depends on" for SoC configs instead of "if" after prompt
ARM/clocksource: use automatic DT probing for ux500 PRCMU
ARM: use const and __initconst for smp_operations
ARM: hisi: do not export smp_operations structures
Conflicts:
arch/arm/mach-integrator/Kconfig
Diffstat (limited to 'drivers/clocksource/clksrc-dbx500-prcmu.c')
-rw-r--r-- | drivers/clocksource/clksrc-dbx500-prcmu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index b375106844d8..dfad6eb99662 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c @@ -12,8 +12,9 @@ * power domain. We use the Timer 4 for our always-on clock * source on DB8500. */ +#include <linux/of.h> +#include <linux/of_address.h> #include <linux/clockchips.h> -#include <linux/clksrc-dbx500-prcmu.h> #include <linux/sched_clock.h> #define RATE_32K 32768 @@ -63,9 +64,9 @@ static u64 notrace dbx500_prcmu_sched_clock_read(void) #endif -void __init clksrc_dbx500_prcmu_init(void __iomem *base) +static void __init clksrc_dbx500_prcmu_init(struct device_node *node) { - clksrc_dbx500_timer_base = base; + clksrc_dbx500_timer_base = of_iomap(node, 0); /* * The A9 sub system expects the timer to be configured as @@ -85,3 +86,5 @@ void __init clksrc_dbx500_prcmu_init(void __iomem *base) #endif clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K); } +CLOCKSOURCE_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", + clksrc_dbx500_prcmu_init); |