aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/cpu.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-08-09 17:10:36 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-08-09 17:48:45 +0200
commite1bbb55d11622012197a654af874f9f485ddbc47 (patch)
tree6373609d38101366bcca4601854df310d6d08156 /arch/arm/mach-ux500/cpu.c
parenta4d9b33be02bd826e09ddfebdd8ac4ccdf1aeee3 (diff)
downloadlinux-linaro-stable-e1bbb55d11622012197a654af874f9f485ddbc47.tar.gz
ARM: ux500: reform Ux500 family names
Counting the U9540 and the new U8540 as a U8500 family member does not work. Instead, split the function in two: cpu_is_u8500_family() covering U8500 and U8520 cpu_is_ux540_family() covering U9540 and U8540 This works much better in practice. Update users to keep the same behaviour. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
-rw-r--r--arch/arm/mach-ux500/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index e2360e7c770d..4b0a9b300312 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -51,7 +51,7 @@ void __init ux500_init_irq(void)
void __iomem *dist_base;
void __iomem *cpu_base;
- if (cpu_is_u8500_family()) {
+ if (cpu_is_u8500_family() || cpu_is_ux540_family()) {
dist_base = __io_address(U8500_GIC_DIST_BASE);
cpu_base = __io_address(U8500_GIC_CPU_BASE);
} else