diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-mv78xx0 | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r-- | arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/memory.h | 10 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 |
5 files changed, 4 insertions, 14 deletions
diff --git a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c index 20f3f125ed2..0e94268d6e6 100644 --- a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c +++ b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | |||
@@ -145,7 +145,7 @@ subsys_initcall(wxl_pci_init); | |||
145 | 145 | ||
146 | MACHINE_START(TERASTATION_WXL, "Buffalo Nas WXL") | 146 | MACHINE_START(TERASTATION_WXL, "Buffalo Nas WXL") |
147 | /* Maintainer: Sebastien Requiem <sebastien@requiem.fr> */ | 147 | /* Maintainer: Sebastien Requiem <sebastien@requiem.fr> */ |
148 | .boot_params = 0x00000100, | 148 | .atag_offset = 0x100, |
149 | .init_machine = wxl_init, | 149 | .init_machine = wxl_init, |
150 | .map_io = mv78xx0_map_io, | 150 | .map_io = mv78xx0_map_io, |
151 | .init_early = mv78xx0_init_early, | 151 | .init_early = mv78xx0_init_early, |
diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c index df5aebe5b0f..50b85ae2da5 100644 --- a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c +++ b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c | |||
@@ -93,7 +93,7 @@ subsys_initcall(db78x00_pci_init); | |||
93 | 93 | ||
94 | MACHINE_START(DB78X00_BP, "Marvell DB-78x00-BP Development Board") | 94 | MACHINE_START(DB78X00_BP, "Marvell DB-78x00-BP Development Board") |
95 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | 95 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ |
96 | .boot_params = 0x00000100, | 96 | .atag_offset = 0x100, |
97 | .init_machine = db78x00_init, | 97 | .init_machine = db78x00_init, |
98 | .map_io = mv78xx0_map_io, | 98 | .map_io = mv78xx0_map_io, |
99 | .init_early = mv78xx0_init_early, | 99 | .init_early = mv78xx0_init_early, |
diff --git a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S index 04891428e48..a7df02b049b 100644 --- a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #include <mach/mv78xx0.h> | 9 | #include <mach/mv78xx0.h> |
10 | 10 | ||
11 | .macro addruart, rp, rv | 11 | .macro addruart, rp, rv, tmp |
12 | ldr \rp, =MV78XX0_REGS_PHYS_BASE | 12 | ldr \rp, =MV78XX0_REGS_PHYS_BASE |
13 | ldr \rv, =MV78XX0_REGS_VIRT_BASE | 13 | ldr \rv, =MV78XX0_REGS_VIRT_BASE |
14 | orr \rp, \rp, #0x00012000 | 14 | orr \rp, \rp, #0x00012000 |
diff --git a/arch/arm/mach-mv78xx0/include/mach/memory.h b/arch/arm/mach-mv78xx0/include/mach/memory.h deleted file mode 100644 index a648c51f2e4..00000000000 --- a/arch/arm/mach-mv78xx0/include/mach/memory.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-mv78xx0/include/mach/memory.h | ||
3 | */ | ||
4 | |||
5 | #ifndef __ASM_ARCH_MEMORY_H | ||
6 | #define __ASM_ARCH_MEMORY_H | ||
7 | |||
8 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
9 | |||
10 | #endif | ||
diff --git a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c index d927f14c681..e85222e5357 100644 --- a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c +++ b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | |||
@@ -78,7 +78,7 @@ subsys_initcall(rd78x00_pci_init); | |||
78 | 78 | ||
79 | MACHINE_START(RD78X00_MASA, "Marvell RD-78x00-MASA Development Board") | 79 | MACHINE_START(RD78X00_MASA, "Marvell RD-78x00-MASA Development Board") |
80 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | 80 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ |
81 | .boot_params = 0x00000100, | 81 | .atag_offset = 0x100, |
82 | .init_machine = rd78x00_masa_init, | 82 | .init_machine = rd78x00_masa_init, |
83 | .map_io = mv78xx0_map_io, | 83 | .map_io = mv78xx0_map_io, |
84 | .init_early = mv78xx0_init_early, | 84 | .init_early = mv78xx0_init_early, |