diff options
Diffstat (limited to 'arch/arm/mach-exynos4')
-rw-r--r-- | arch/arm/mach-exynos4/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/mach-armlex4210.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/mach-nuri.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/mach-smdkc210.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/mach-smdkv310.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/mach-universal_c210.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/debug-macro.S b/arch/arm/mach-exynos4/include/mach/debug-macro.S index a442ef861167..6cacf16a67a6 100644 --- a/arch/arm/mach-exynos4/include/mach/debug-macro.S +++ b/arch/arm/mach-exynos4/include/mach/debug-macro.S | |||
@@ -20,7 +20,7 @@ | |||
20 | * aligned and add in the offset when we load the value here. | 20 | * aligned and add in the offset when we load the value here. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | .macro addruart, rp, rv | 23 | .macro addruart, rp, rv, tmp |
24 | ldr \rp, = S3C_PA_UART | 24 | ldr \rp, = S3C_PA_UART |
25 | ldr \rv, = S3C_VA_UART | 25 | ldr \rv, = S3C_VA_UART |
26 | #if CONFIG_DEBUG_S3C_UART != 0 | 26 | #if CONFIG_DEBUG_S3C_UART != 0 |
diff --git a/arch/arm/mach-exynos4/mach-armlex4210.c b/arch/arm/mach-exynos4/mach-armlex4210.c index b482c6285fc4..f0ca6c157d29 100644 --- a/arch/arm/mach-exynos4/mach-armlex4210.c +++ b/arch/arm/mach-exynos4/mach-armlex4210.c | |||
@@ -207,7 +207,7 @@ static void __init armlex4210_machine_init(void) | |||
207 | 207 | ||
208 | MACHINE_START(ARMLEX4210, "ARMLEX4210") | 208 | MACHINE_START(ARMLEX4210, "ARMLEX4210") |
209 | /* Maintainer: Alim Akhtar <alim.akhtar@samsung.com> */ | 209 | /* Maintainer: Alim Akhtar <alim.akhtar@samsung.com> */ |
210 | .boot_params = S5P_PA_SDRAM + 0x100, | 210 | .atag_offset = 0x100, |
211 | .init_irq = exynos4_init_irq, | 211 | .init_irq = exynos4_init_irq, |
212 | .map_io = armlex4210_map_io, | 212 | .map_io = armlex4210_map_io, |
213 | .init_machine = armlex4210_machine_init, | 213 | .init_machine = armlex4210_machine_init, |
diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c index 43be71b799cb..6e0536818bf5 100644 --- a/arch/arm/mach-exynos4/mach-nuri.c +++ b/arch/arm/mach-exynos4/mach-nuri.c | |||
@@ -1152,7 +1152,7 @@ static void __init nuri_machine_init(void) | |||
1152 | 1152 | ||
1153 | MACHINE_START(NURI, "NURI") | 1153 | MACHINE_START(NURI, "NURI") |
1154 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ | 1154 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ |
1155 | .boot_params = S5P_PA_SDRAM + 0x100, | 1155 | .atag_offset = 0x100, |
1156 | .init_irq = exynos4_init_irq, | 1156 | .init_irq = exynos4_init_irq, |
1157 | .map_io = nuri_map_io, | 1157 | .map_io = nuri_map_io, |
1158 | .init_machine = nuri_machine_init, | 1158 | .init_machine = nuri_machine_init, |
diff --git a/arch/arm/mach-exynos4/mach-smdkc210.c b/arch/arm/mach-exynos4/mach-smdkc210.c index a7c65e05c1eb..b24ddd7ad8fe 100644 --- a/arch/arm/mach-exynos4/mach-smdkc210.c +++ b/arch/arm/mach-exynos4/mach-smdkc210.c | |||
@@ -301,7 +301,7 @@ static void __init smdkc210_machine_init(void) | |||
301 | 301 | ||
302 | MACHINE_START(SMDKC210, "SMDKC210") | 302 | MACHINE_START(SMDKC210, "SMDKC210") |
303 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 303 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
304 | .boot_params = S5P_PA_SDRAM + 0x100, | 304 | .atag_offset = 0x100, |
305 | .init_irq = exynos4_init_irq, | 305 | .init_irq = exynos4_init_irq, |
306 | .map_io = smdkc210_map_io, | 306 | .map_io = smdkc210_map_io, |
307 | .init_machine = smdkc210_machine_init, | 307 | .init_machine = smdkc210_machine_init, |
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c index ea4149556860..d90fcddbee1f 100644 --- a/arch/arm/mach-exynos4/mach-smdkv310.c +++ b/arch/arm/mach-exynos4/mach-smdkv310.c | |||
@@ -255,7 +255,7 @@ static void __init smdkv310_machine_init(void) | |||
255 | MACHINE_START(SMDKV310, "SMDKV310") | 255 | MACHINE_START(SMDKV310, "SMDKV310") |
256 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 256 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
257 | /* Maintainer: Changhwan Youn <chaos.youn@samsung.com> */ | 257 | /* Maintainer: Changhwan Youn <chaos.youn@samsung.com> */ |
258 | .boot_params = S5P_PA_SDRAM + 0x100, | 258 | .atag_offset = 0x100, |
259 | .init_irq = exynos4_init_irq, | 259 | .init_irq = exynos4_init_irq, |
260 | .map_io = smdkv310_map_io, | 260 | .map_io = smdkv310_map_io, |
261 | .init_machine = smdkv310_machine_init, | 261 | .init_machine = smdkv310_machine_init, |
diff --git a/arch/arm/mach-exynos4/mach-universal_c210.c b/arch/arm/mach-exynos4/mach-universal_c210.c index b3b5d8911004..2aac6f755c8e 100644 --- a/arch/arm/mach-exynos4/mach-universal_c210.c +++ b/arch/arm/mach-exynos4/mach-universal_c210.c | |||
@@ -762,7 +762,7 @@ static void __init universal_machine_init(void) | |||
762 | 762 | ||
763 | MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") | 763 | MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") |
764 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ | 764 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ |
765 | .boot_params = S5P_PA_SDRAM + 0x100, | 765 | .atag_offset = 0x100, |
766 | .init_irq = exynos4_init_irq, | 766 | .init_irq = exynos4_init_irq, |
767 | .map_io = universal_map_io, | 767 | .map_io = universal_map_io, |
768 | .init_machine = universal_machine_init, | 768 | .init_machine = universal_machine_init, |