Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be35bd2b authored by Shawn Guo's avatar Shawn Guo
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
parent 2efb9504

arch/arm/mach-mxs/timer.c

+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/clockchips.h>

#include <linux/clk.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>



#include <asm/mach/time.h>
@@ -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__);