diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:53 -0400 |
commit | 5839fec9d8db35b2b07359b18a77295418e239ad (patch) | |
tree | f060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-ux500 | |
parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 |
4 files changed, 5 insertions, 23 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 537ab63c1dc9..f67b83dd9010 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -646,7 +646,7 @@ static void __init mop500_init_machine(void) | |||
646 | 646 | ||
647 | MACHINE_START(U8500, "ST-Ericsson MOP500 platform") | 647 | MACHINE_START(U8500, "ST-Ericsson MOP500 platform") |
648 | /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ | 648 | /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ |
649 | .boot_params = 0x100, | 649 | .atag_offset = 0x100, |
650 | .map_io = u8500_map_io, | 650 | .map_io = u8500_map_io, |
651 | .init_irq = ux500_init_irq, | 651 | .init_irq = ux500_init_irq, |
652 | /* we re-use nomadik timer here */ | 652 | /* we re-use nomadik timer here */ |
@@ -655,7 +655,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") | |||
655 | MACHINE_END | 655 | MACHINE_END |
656 | 656 | ||
657 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | 657 | MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") |
658 | .boot_params = 0x100, | 658 | .atag_offset = 0x100, |
659 | .map_io = u8500_map_io, | 659 | .map_io = u8500_map_io, |
660 | .init_irq = ux500_init_irq, | 660 | .init_irq = ux500_init_irq, |
661 | .timer = &ux500_timer, | 661 | .timer = &ux500_timer, |
@@ -663,7 +663,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") | |||
663 | MACHINE_END | 663 | MACHINE_END |
664 | 664 | ||
665 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") | 665 | MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") |
666 | .boot_params = 0x100, | 666 | .atag_offset = 0x100, |
667 | .map_io = u8500_map_io, | 667 | .map_io = u8500_map_io, |
668 | .init_irq = ux500_init_irq, | 668 | .init_irq = ux500_init_irq, |
669 | /* we re-use nomadik timer here */ | 669 | /* 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 2d9e191bd30a..e014aa749b03 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 700fb05ee815..8d74d927d4e2 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 2ef697a67006..000000000000 --- 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 | ||