From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 25 Mar 2013 11:41:39 +0000 (+0800)
Subject: ARM: mxs: remove cpu_is_mx23() call from timer code
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=220d2f269ab017c139bbce2cb41f3bd1b1ddcffa;p=openwrt%2Fstaging%2Fblogic.git

ARM: mxs: remove cpu_is_mx23() call from timer code

Remove cpu_is_mx23() call from timer code by using
of_device_is_compatible() instead.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---

diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
index c8cda1834655..f4dd96ff081a 100644
--- a/arch/arm/mach-mxs/timer.c
+++ b/arch/arm/mach-mxs/timer.c
@@ -266,7 +266,8 @@ static void __init mxs_timer_init(struct device_node *np)
 
 	/* get timrot version */
 	timrot_major_version = __raw_readl(mxs_timrot_base +
-				(cpu_is_mx23() ? MX23_TIMROT_VERSION_OFFSET :
+			(of_device_is_compatible(np, "fsl,imx23-timrot") ?
+						MX23_TIMROT_VERSION_OFFSET :
 						MX28_TIMROT_VERSION_OFFSET));
 	timrot_major_version >>= BP_TIMROT_MAJOR_VERSION;