From: Shawn Guo Date: Mon, 25 Mar 2013 11:41:39 +0000 (+0800) Subject: ARM: mxs: remove cpu_is_mx23() call from timer code X-Git-Tag: accepted/tizen/common/20141203.182822~2308^2~11^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=220d2f269ab017c139bbce2cb41f3bd1b1ddcffa;p=platform%2Fkernel%2Flinux-arm64.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 --- diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index c8cda18..f4dd96ff 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;