diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-08-09 11:10:36 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-08-09 11:48:45 -0400 |
commit | e1bbb55d11622012197a654af874f9f485ddbc47 (patch) | |
tree | 6373609d38101366bcca4601854df310d6d08156 /arch/arm/mach-ux500/cpu-db8500.c | |
parent | a4d9b33be02bd826e09ddfebdd8ac4ccdf1aeee3 (diff) |
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-db8500.c')
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index db3c52d56ca..2dd8593e72d 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
@@ -80,7 +80,7 @@ void __init u8500_map_io(void) | |||
80 | 80 | ||
81 | iotable_init(u8500_common_io_desc, ARRAY_SIZE(u8500_common_io_desc)); | 81 | iotable_init(u8500_common_io_desc, ARRAY_SIZE(u8500_common_io_desc)); |
82 | 82 | ||
83 | if (cpu_is_u9540()) | 83 | if (cpu_is_ux540_family()) |
84 | iotable_init(u9540_io_desc, ARRAY_SIZE(u9540_io_desc)); | 84 | iotable_init(u9540_io_desc, ARRAY_SIZE(u9540_io_desc)); |
85 | else | 85 | else |
86 | iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc)); | 86 | iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc)); |