If twd_base is not set, try to map the TWD registers from "arm,smp-twd" Device Tree node (compatible value as used in Highbank's DT).
Signed-off-by: Pawel Moll <[email protected]> --- arch/arm/plat-versatile/localtimer.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-versatile/localtimer.c b/arch/arm/plat-versatile/localtimer.c index 0fb3961..e3da322 100644 --- a/arch/arm/plat-versatile/localtimer.c +++ b/arch/arm/plat-versatile/localtimer.c @@ -11,6 +11,8 @@ #include <linux/init.h> #include <linux/smp.h> #include <linux/clockchips.h> +#include <linux/of.h> +#include <linux/of_address.h> #include <asm/smp_twd.h> #include <asm/localtimer.h> @@ -21,6 +23,16 @@ */ int __cpuinit local_timer_setup(struct clock_event_device *evt) { +#if defined(CONFIG_OF) + if (!twd_base) { + struct device_node *np = of_find_compatible_node(NULL, + NULL, "arm,smp-twd"); + + twd_base = of_iomap(np, 0); + if (!twd_base) + return -ENXIO; + } +#endif evt->irq = IRQ_LOCALTIMER; twd_timer_setup(evt); return 0; -- 1.7.5.4 _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
