From be35bd2bcd4fc5d67a24ad134138e606f69d11a4 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Mon, 25 Mar 2013 14:57:41 +0800 Subject: [PATCH] ARM: mxs: get timrot base address from device tree Instead of using static defines, it gets timrot base address with mapping from device tree. Signed-off-by: Shawn Guo --- arch/arm/mach-mxs/timer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index f5142aa234a3..c8cda1834655 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -79,7 +80,7 @@ static struct clock_event_device mxs_clockevent_device; static enum clock_event_mode mxs_clockevent_mode = CLOCK_EVT_MODE_UNUSED; -static void __iomem *mxs_timrot_base = MXS_IO_ADDRESS(MXS_TIMROT_BASE_ADDR); +static void __iomem *mxs_timrot_base; static u32 timrot_major_version; static inline void timrot_irq_disable(void) @@ -247,6 +248,9 @@ static void __init mxs_timer_init(struct device_node *np) struct clk *timer_clk; int irq; + mxs_timrot_base = of_iomap(np, 0); + WARN_ON(!mxs_timrot_base); + timer_clk = of_clk_get(np, 0); if (IS_ERR(timer_clk)) { pr_err("%s: failed to get clk\n", __func__); -- 2.39.5