commit 79964bcd792fd9625affb4d7092ee09697f0409a
author Loic PALLARDY <loic.pallardy@st.com> Mon Sep 03 15:10:23 2012 +0200
committer Olof Johansson <olof@lixom.net> Tue Sep 04 21:38:14 2012 -0700
tree b2df34d67daf72d43d778a07ac6b923a3d421251
parent 1d3266ecca67066e537fe0e0669bed77d355f886

ARM: ux500: Correct Ux500 family names usage

Update users with cpu_is_ux540_family() to keep x540
family functional.

Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/mach-ux500/timer.c

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 66e7f00..6f39731 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -54,7 +54,7 @@
 	void __iomem *tmp_base;
 	struct device_node *np;
 
-	if (cpu_is_u8500_family()) {
+	if (cpu_is_u8500_family() || cpu_is_ux540_family()) {
 		mtu_timer_base = __io_address(U8500_MTU0_BASE);
 		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
 	} else {