diff options
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/memory.h | 18 | ||||
-rw-r--r-- | arch/arm/mach-ux500/platsmp.c | 10 |
5 files changed, 9 insertions, 29 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index cd54abaccd9..2cc4876db21 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -645,7 +645,7 @@ static void __init mop500_init_machine(void) | |||
645 | 645 | ||
646 | MACHINE_START(U8500, "ST-Ericsson MOP500 platform") | 646 | MACHINE_START(U8500, "ST-Ericsson MOP500 platform") |
647 | /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ | 647 | /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ |
648 | .boot_params = 0x100, | 648 | .atag_offset = 0x100, |
649 | .map_io = u8500_map_io, | 649 | .map_io = u8500_map_io, |
650 | .init_irq = ux500_init_irq, | 650 | .init_irq = ux500_init_irq, |
651 | /* we re-use nomadik timer here */ | 651 | /* we re-use nomadik timer here */ |
@@ -654,7 +654,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") | |||
654 | MACHINE_END | 654 | MACHINE_END |
655 | 655 | ||
656 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | 656 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") |
657 | .boot_params = 0x100, | 657 | .atag_offset = 0x100, |
658 | .map_io = u8500_map_io, | 658 | .map_io = u8500_map_io, |
659 | .init_irq = ux500_init_irq, | 659 | .init_irq = ux500_init_irq, |
660 | .timer = &ux500_timer, | 660 | .timer = &ux500_timer, |
@@ -662,7 +662,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | |||
662 | MACHINE_END | 662 | MACHINE_END |
663 | 663 | ||
664 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") | 664 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") |
665 | .boot_params = 0x100, | 665 | .atag_offset = 0x100, |
666 | .map_io = u8500_map_io, | 666 | .map_io = u8500_map_io, |
667 | .init_irq = ux500_init_irq, | 667 | .init_irq = ux500_init_irq, |
668 | /* we re-use nomadik timer here */ | 668 | /* we re-use nomadik timer here */ |
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index e58f0f56242..166d47a5f4f 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c | |||
@@ -118,7 +118,7 @@ static void __init u5500_init_machine(void) | |||
118 | } | 118 | } |
119 | 119 | ||
120 | MACHINE_START(U5500, "ST-Ericsson U5500 Platform") | 120 | MACHINE_START(U5500, "ST-Ericsson U5500 Platform") |
121 | .boot_params = 0x00000100, | 121 | .atag_offset = 0x100, |
122 | .map_io = u5500_map_io, | 122 | .map_io = u5500_map_io, |
123 | .init_irq = ux500_init_irq, | 123 | .init_irq = ux500_init_irq, |
124 | .timer = &ux500_timer, | 124 | .timer = &ux500_timer, |
diff --git a/arch/arm/mach-ux500/include/mach/debug-macro.S b/arch/arm/mach-ux500/include/mach/debug-macro.S index 700fb05ee81..8d74d927d4e 100644 --- a/arch/arm/mach-ux500/include/mach/debug-macro.S +++ b/arch/arm/mach-ux500/include/mach/debug-macro.S | |||
@@ -35,7 +35,7 @@ | |||
35 | #define UX500_UART(n) __UX500_UART(n) | 35 | #define UX500_UART(n) __UX500_UART(n) |
36 | #define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) | 36 | #define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) |
37 | 37 | ||
38 | .macro addruart, rp, rv | 38 | .macro addruart, rp, rv, tmp |
39 | ldr \rp, =UART_BASE @ no, physical address | 39 | ldr \rp, =UART_BASE @ no, physical address |
40 | ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address | 40 | ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address |
41 | .endm | 41 | .endm |
diff --git a/arch/arm/mach-ux500/include/mach/memory.h b/arch/arm/mach-ux500/include/mach/memory.h deleted file mode 100644 index 2ef697a6700..00000000000 --- a/arch/arm/mach-ux500/include/mach/memory.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2009 ST-Ericsson | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | */ | ||
9 | #ifndef __ASM_ARCH_MEMORY_H | ||
10 | #define __ASM_ARCH_MEMORY_H | ||
11 | |||
12 | /* | ||
13 | * Physical DRAM offset. | ||
14 | */ | ||
15 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
16 | #define BUS_OFFSET UL(0x00000000) | ||
17 | |||
18 | #endif | ||
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index a33df5f4c27..eb5199102cf 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c | |||
@@ -156,12 +156,10 @@ void __init smp_init_cpus(void) | |||
156 | ncores = scu_base ? scu_get_core_count(scu_base) : 1; | 156 | ncores = scu_base ? scu_get_core_count(scu_base) : 1; |
157 | 157 | ||
158 | /* sanity check */ | 158 | /* sanity check */ |
159 | if (ncores > NR_CPUS) { | 159 | if (ncores > nr_cpu_ids) { |
160 | printk(KERN_WARNING | 160 | pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", |
161 | "U8500: no. of cores (%d) greater than configured " | 161 | ncores, nr_cpu_ids); |
162 | "maximum of %d - clipping\n", | 162 | ncores = nr_cpu_ids; |
163 | ncores, NR_CPUS); | ||
164 | ncores = NR_CPUS; | ||
165 | } | 163 | } |
166 | 164 | ||
167 | for (i = 0; i < ncores; i++) | 165 | for (i = 0; i < ncores; i++) |