diff options
author | Loic PALLARDY <loic.pallardy@st.com> | 2012-09-03 09:10:23 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-05 00:38:14 -0400 |
commit | 79964bcd792fd9625affb4d7092ee09697f0409a (patch) | |
tree | b2df34d67daf72d43d778a07ac6b923a3d421251 | |
parent | 1d3266ecca67066e537fe0e0669bed77d355f886 (diff) |
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>
-rw-r--r-- | arch/arm/mach-ux500/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/platsmp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/timer.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index 8d73b066a18..bc5a516a586 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c | |||
@@ -149,7 +149,7 @@ static unsigned long clk_mtu_get_rate(struct clk *clk) | |||
149 | unsigned long mturate; | 149 | unsigned long mturate; |
150 | unsigned long retclk; | 150 | unsigned long retclk; |
151 | 151 | ||
152 | if (cpu_is_u8500_family()) | 152 | if (cpu_is_u8500_family() || cpu_is_ux540_family()) |
153 | addr = __io_address(U8500_PRCMU_BASE); | 153 | addr = __io_address(U8500_PRCMU_BASE); |
154 | else | 154 | else |
155 | ux500_unknown_soc(); | 155 | ux500_unknown_soc(); |
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index cb35897c1ea..a5dda68444d 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c | |||
@@ -118,7 +118,7 @@ static void __init wakeup_secondary(void) | |||
118 | { | 118 | { |
119 | void __iomem *backupram; | 119 | void __iomem *backupram; |
120 | 120 | ||
121 | if (cpu_is_u8500_family()) | 121 | if (cpu_is_u8500_family() || cpu_is_ux540_family()) |
122 | backupram = __io_address(U8500_BACKUPRAM0_BASE); | 122 | backupram = __io_address(U8500_BACKUPRAM0_BASE); |
123 | else | 123 | else |
124 | ux500_unknown_soc(); | 124 | ux500_unknown_soc(); |
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 66e7f00884a..6f39731951b 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c | |||
@@ -54,7 +54,7 @@ static void __init ux500_timer_init(void) | |||
54 | void __iomem *tmp_base; | 54 | void __iomem *tmp_base; |
55 | struct device_node *np; | 55 | struct device_node *np; |
56 | 56 | ||
57 | if (cpu_is_u8500_family()) { | 57 | if (cpu_is_u8500_family() || cpu_is_ux540_family()) { |
58 | mtu_timer_base = __io_address(U8500_MTU0_BASE); | 58 | mtu_timer_base = __io_address(U8500_MTU0_BASE); |
59 | prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); | 59 | prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); |
60 | } else { | 60 | } else { |