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>
tirimbino
Loic PALLARDY 13 years ago committed by Olof Johansson
parent 1d3266ecca
commit 79964bcd79
  1. 2
      arch/arm/mach-ux500/clock.c
  2. 2
      arch/arm/mach-ux500/platsmp.c
  3. 2
      arch/arm/mach-ux500/timer.c

@ -149,7 +149,7 @@ static unsigned long clk_mtu_get_rate(struct clk *clk)
unsigned long mturate;
unsigned long retclk;
if (cpu_is_u8500_family())
if (cpu_is_u8500_family() || cpu_is_ux540_family())
addr = __io_address(U8500_PRCMU_BASE);
else
ux500_unknown_soc();

@ -118,7 +118,7 @@ static void __init wakeup_secondary(void)
{
void __iomem *backupram;
if (cpu_is_u8500_family())
if (cpu_is_u8500_family() || cpu_is_ux540_family())
backupram = __io_address(U8500_BACKUPRAM0_BASE);
else
ux500_unknown_soc();

@ -54,7 +54,7 @@ static void __init ux500_timer_init(void)
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 {

Loading…
Cancel
Save