diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:58:06 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:11:41 -0400 |
commit | a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf (patch) | |
tree | 64a1035b02cb8aae34b96fc7c1c7caaad337ac07 /arch/arm/mach-s3c64xx | |
parent | 335332770c68649ffeaf5dc2b58d9cd40041e295 (diff) | |
parent | 531a6a941745e1e045dd2a6bd09e1dc01247a5f3 (diff) |
Merge branch 'depends/rmk/devel-stable' into next/board
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/include/mach/entry-macro.S
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/mct.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/cpu.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/memory.h | 20 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-anw6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-hmt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-mini6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-ncp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-real6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq5.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq7.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 |
13 files changed, 13 insertions, 31 deletions
diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c index 6c498f9a18c5..c7047838e112 100644 --- a/arch/arm/mach-s3c64xx/cpu.c +++ b/arch/arm/mach-s3c64xx/cpu.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/serial_core.h> | 20 | #include <linux/serial_core.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/dma-mapping.h> | ||
23 | 24 | ||
24 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
25 | #include <mach/map.h> | 26 | #include <mach/map.h> |
@@ -143,6 +144,7 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size) | |||
143 | /* initialise the io descriptors we need for initialisation */ | 144 | /* initialise the io descriptors we need for initialisation */ |
144 | iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); | 145 | iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); |
145 | iotable_init(mach_desc, size); | 146 | iotable_init(mach_desc, size); |
147 | init_consistent_dma_size(SZ_8M); | ||
146 | 148 | ||
147 | /* detect cpu id */ | 149 | /* detect cpu id */ |
148 | s3c64xx_init_cpu(); | 150 | s3c64xx_init_cpu(); |
diff --git a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S index a29e70550c70..c0c076a90f27 100644 --- a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S +++ b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S | |||
@@ -21,7 +21,7 @@ | |||
21 | * aligned and add in the offset when we load the value here. | 21 | * aligned and add in the offset when we load the value here. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | .macro addruart, rp, rv | 24 | .macro addruart, rp, rv, tmp |
25 | ldr \rp, = S3C_PA_UART | 25 | ldr \rp, = S3C_PA_UART |
26 | ldr \rv, = (S3C_VA_UART + S3C_PA_UART & 0xfffff) | 26 | ldr \rv, = (S3C_VA_UART + S3C_PA_UART & 0xfffff) |
27 | #if CONFIG_DEBUG_S3C_UART != 0 | 27 | #if CONFIG_DEBUG_S3C_UART != 0 |
diff --git a/arch/arm/mach-s3c64xx/include/mach/memory.h b/arch/arm/mach-s3c64xx/include/mach/memory.h deleted file mode 100644 index 4760cdae1eb6..000000000000 --- a/arch/arm/mach-s3c64xx/include/mach/memory.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* arch/arm/mach-s3c6400/include/mach/memory.h | ||
2 | * | ||
3 | * Copyright 2008 Openmoko, Inc. | ||
4 | * Copyright 2008 Simtec Electronics | ||
5 | * Ben Dooks <ben@simtec.co.uk> | ||
6 | * http://armlinux.simtec.co.uk/ | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #ifndef __ASM_ARCH_MEMORY_H | ||
14 | #define __ASM_ARCH_MEMORY_H | ||
15 | |||
16 | #define PLAT_PHYS_OFFSET UL(0x50000000) | ||
17 | |||
18 | #define CONSISTENT_DMA_SIZE SZ_8M | ||
19 | |||
20 | #endif | ||
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index cb8864327ac4..d164a282bfb4 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c | |||
@@ -233,7 +233,7 @@ static void __init anw6410_machine_init(void) | |||
233 | 233 | ||
234 | MACHINE_START(ANW6410, "A&W6410") | 234 | MACHINE_START(ANW6410, "A&W6410") |
235 | /* Maintainer: Kwangwoo Lee <kwangwoo.lee@gmail.com> */ | 235 | /* Maintainer: Kwangwoo Lee <kwangwoo.lee@gmail.com> */ |
236 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 236 | .atag_offset = 0x100, |
237 | 237 | ||
238 | .init_irq = s3c6410_init_irq, | 238 | .init_irq = s3c6410_init_irq, |
239 | .map_io = anw6410_map_io, | 239 | .map_io = anw6410_map_io, |
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index af0c2fe1ea37..4c76e08423fb 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -766,7 +766,7 @@ static void __init crag6410_machine_init(void) | |||
766 | 766 | ||
767 | MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") | 767 | MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") |
768 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ | 768 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ |
769 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 769 | .atag_offset = 0x100, |
770 | .init_irq = s3c6410_init_irq, | 770 | .init_irq = s3c6410_init_irq, |
771 | .map_io = crag6410_map_io, | 771 | .map_io = crag6410_map_io, |
772 | .init_machine = crag6410_machine_init, | 772 | .init_machine = crag6410_machine_init, |
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index b3d93cc8dde0..19a0887e1c1e 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
@@ -265,7 +265,7 @@ static void __init hmt_machine_init(void) | |||
265 | 265 | ||
266 | MACHINE_START(HMT, "Airgoo-HMT") | 266 | MACHINE_START(HMT, "Airgoo-HMT") |
267 | /* Maintainer: Peter Korsgaard <jacmet@sunsite.dk> */ | 267 | /* Maintainer: Peter Korsgaard <jacmet@sunsite.dk> */ |
268 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 268 | .atag_offset = 0x100, |
269 | .init_irq = s3c6410_init_irq, | 269 | .init_irq = s3c6410_init_irq, |
270 | .map_io = hmt_map_io, | 270 | .map_io = hmt_map_io, |
271 | .init_machine = hmt_machine_init, | 271 | .init_machine = hmt_machine_init, |
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 527f49bd1b57..e91f63f7a490 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c | |||
@@ -349,7 +349,7 @@ static void __init mini6410_machine_init(void) | |||
349 | 349 | ||
350 | MACHINE_START(MINI6410, "MINI6410") | 350 | MACHINE_START(MINI6410, "MINI6410") |
351 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ | 351 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ |
352 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 352 | .atag_offset = 0x100, |
353 | .init_irq = s3c6410_init_irq, | 353 | .init_irq = s3c6410_init_irq, |
354 | .map_io = mini6410_map_io, | 354 | .map_io = mini6410_map_io, |
355 | .init_machine = mini6410_machine_init, | 355 | .init_machine = mini6410_machine_init, |
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c index 01c6857c5b63..c30f2e5e0d85 100644 --- a/arch/arm/mach-s3c64xx/mach-ncp.c +++ b/arch/arm/mach-s3c64xx/mach-ncp.c | |||
@@ -97,7 +97,7 @@ static void __init ncp_machine_init(void) | |||
97 | 97 | ||
98 | MACHINE_START(NCP, "NCP") | 98 | MACHINE_START(NCP, "NCP") |
99 | /* Maintainer: Samsung Electronics */ | 99 | /* Maintainer: Samsung Electronics */ |
100 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 100 | .atag_offset = 0x100, |
101 | .init_irq = s3c6410_init_irq, | 101 | .init_irq = s3c6410_init_irq, |
102 | .map_io = ncp_map_io, | 102 | .map_io = ncp_map_io, |
103 | .init_machine = ncp_machine_init, | 103 | .init_machine = ncp_machine_init, |
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index 95b04b1729e3..10870cb5b39e 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -329,7 +329,7 @@ static void __init real6410_machine_init(void) | |||
329 | 329 | ||
330 | MACHINE_START(REAL6410, "REAL6410") | 330 | MACHINE_START(REAL6410, "REAL6410") |
331 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ | 331 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ |
332 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 332 | .atag_offset = 0x100, |
333 | 333 | ||
334 | .init_irq = s3c6410_init_irq, | 334 | .init_irq = s3c6410_init_irq, |
335 | .map_io = real6410_map_io, | 335 | .map_io = real6410_map_io, |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c index 342e8dfddf8b..cbb57ded3d95 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq5.c +++ b/arch/arm/mach-s3c64xx/mach-smartq5.c | |||
@@ -146,7 +146,7 @@ static void __init smartq5_machine_init(void) | |||
146 | 146 | ||
147 | MACHINE_START(SMARTQ5, "SmartQ 5") | 147 | MACHINE_START(SMARTQ5, "SmartQ 5") |
148 | /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ | 148 | /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ |
149 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 149 | .atag_offset = 0x100, |
150 | .init_irq = s3c6410_init_irq, | 150 | .init_irq = s3c6410_init_irq, |
151 | .map_io = smartq_map_io, | 151 | .map_io = smartq_map_io, |
152 | .init_machine = smartq5_machine_init, | 152 | .init_machine = smartq5_machine_init, |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c index 57963977da8e..04f914b85fdf 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq7.c +++ b/arch/arm/mach-s3c64xx/mach-smartq7.c | |||
@@ -162,7 +162,7 @@ static void __init smartq7_machine_init(void) | |||
162 | 162 | ||
163 | MACHINE_START(SMARTQ7, "SmartQ 7") | 163 | MACHINE_START(SMARTQ7, "SmartQ 7") |
164 | /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ | 164 | /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ |
165 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 165 | .atag_offset = 0x100, |
166 | .init_irq = s3c6410_init_irq, | 166 | .init_irq = s3c6410_init_irq, |
167 | .map_io = smartq_map_io, | 167 | .map_io = smartq_map_io, |
168 | .init_machine = smartq7_machine_init, | 168 | .init_machine = smartq7_machine_init, |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c index 3cca642f1e6d..6fd5e95f8f75 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c | |||
@@ -85,7 +85,7 @@ static void __init smdk6400_machine_init(void) | |||
85 | 85 | ||
86 | MACHINE_START(SMDK6400, "SMDK6400") | 86 | MACHINE_START(SMDK6400, "SMDK6400") |
87 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 87 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
88 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 88 | .atag_offset = 0x100, |
89 | 89 | ||
90 | .init_irq = s3c6400_init_irq, | 90 | .init_irq = s3c6400_init_irq, |
91 | .map_io = smdk6400_map_io, | 91 | .map_io = smdk6400_map_io, |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index a9f3183e0290..7b66ede9fbcd 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -703,7 +703,7 @@ static void __init smdk6410_machine_init(void) | |||
703 | 703 | ||
704 | MACHINE_START(SMDK6410, "SMDK6410") | 704 | MACHINE_START(SMDK6410, "SMDK6410") |
705 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 705 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
706 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 706 | .atag_offset = 0x100, |
707 | 707 | ||
708 | .init_irq = s3c6410_init_irq, | 708 | .init_irq = s3c6410_init_irq, |
709 | .map_io = smdk6410_map_io, | 709 | .map_io = smdk6410_map_io, |