diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 10:29:32 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 10:29:32 -0400 |
commit | 815acebff7ac578970986ca3f0ff406c92a0e243 (patch) | |
tree | 651c411bbedeb0500ab9912766e992be3d5a8bab /arch/arm/mach-ux500/platsmp.c | |
parent | 417f381c4568212275f0244500d7d5e1cdb5f99f (diff) | |
parent | 72fb92200d6c31b9982c06784e4bcff2f5b7d8b6 (diff) |
Merge branch 'ux500/delete-u5500' into next/soc
Conflicts:
arch/arm/mach-ux500/cache-l2x0.c
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/mbox-db5500.c
arch/arm/mach-ux500/platsmp.c
arch/arm/mach-ux500/timer.c
Resolve lots of identical conflicts between the removal of
u5500 and the addition of u8540.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/platsmp.c')
-rw-r--r-- | arch/arm/mach-ux500/platsmp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index f499a0703928..da1d5ad5bd45 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c | |||
@@ -48,9 +48,7 @@ static void write_pen_release(int val) | |||
48 | 48 | ||
49 | static void __iomem *scu_base_addr(void) | 49 | static void __iomem *scu_base_addr(void) |
50 | { | 50 | { |
51 | if (cpu_is_u5500()) | 51 | if (cpu_is_u8500_family()) |
52 | return __io_address(U5500_SCU_BASE); | ||
53 | else if (cpu_is_u8500_family()) | ||
54 | return __io_address(U8500_SCU_BASE); | 52 | return __io_address(U8500_SCU_BASE); |
55 | else | 53 | else |
56 | ux500_unknown_soc(); | 54 | ux500_unknown_soc(); |
@@ -120,9 +118,7 @@ static void __init wakeup_secondary(void) | |||
120 | { | 118 | { |
121 | void __iomem *backupram; | 119 | void __iomem *backupram; |
122 | 120 | ||
123 | if (cpu_is_u5500()) | 121 | if (cpu_is_u8500_family()) |
124 | backupram = __io_address(U5500_BACKUPRAM0_BASE); | ||
125 | else if (cpu_is_u8500_family()) | ||
126 | backupram = __io_address(U8500_BACKUPRAM0_BASE); | 122 | backupram = __io_address(U8500_BACKUPRAM0_BASE); |
127 | else | 123 | else |
128 | ux500_unknown_soc(); | 124 | ux500_unknown_soc(); |