diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-22 17:32:07 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-23 14:11:28 -0500 |
commit | 3fa754c298b7e6fcbdbe615d6b609117fa7e0de9 (patch) | |
tree | aebfe49d8b77a839f73c7c32e69e364a28103513 /arch/arm/mach-s5pv210/mach-smdkv210.c | |
parent | dd4153d9af67496f6545831e72c743060d33a830 (diff) |
ARM: 7248/1: S5PV210: introduce arch/arm/mach-s5pv210/common.[ch]
This patch introduces common.[ch] which are used only in the
arch/arm/mach-s5pv210/ directory. The common.c file merges
the cpu.c and init.c which are used commonly on S5PCV210/S5PC100
SoC and the common.h local header file replaces with plat/s5pv210.h
file.
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkv210.c')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index a9106c392398..bc35e8261e5b 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <plat/regs-serial.h> | 33 | #include <plat/regs-serial.h> |
34 | #include <plat/regs-srom.h> | 34 | #include <plat/regs-srom.h> |
35 | #include <plat/gpio-cfg.h> | 35 | #include <plat/gpio-cfg.h> |
36 | #include <plat/s5pv210.h> | ||
37 | #include <plat/devs.h> | 36 | #include <plat/devs.h> |
38 | #include <plat/cpu.h> | 37 | #include <plat/cpu.h> |
39 | #include <plat/adc.h> | 38 | #include <plat/adc.h> |
@@ -47,6 +46,8 @@ | |||
47 | #include <plat/backlight.h> | 46 | #include <plat/backlight.h> |
48 | #include <plat/regs-fb-v4.h> | 47 | #include <plat/regs-fb-v4.h> |
49 | 48 | ||
49 | #include "common.h" | ||
50 | |||
50 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 51 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
51 | #define SMDKV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 52 | #define SMDKV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
52 | S3C2410_UCON_RXILEVEL | \ | 53 | S3C2410_UCON_RXILEVEL | \ |
@@ -277,7 +278,7 @@ static struct platform_pwm_backlight_data smdkv210_bl_data = { | |||
277 | 278 | ||
278 | static void __init smdkv210_map_io(void) | 279 | static void __init smdkv210_map_io(void) |
279 | { | 280 | { |
280 | s5p_init_io(NULL, 0, S5P_VA_CHIPID); | 281 | s5pv210_init_io(NULL, 0); |
281 | s3c24xx_init_clocks(24000000); | 282 | s3c24xx_init_clocks(24000000); |
282 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); | 283 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); |
283 | s5p_set_timer_source(S5P_PWM2, S5P_PWM4); | 284 | s5p_set_timer_source(S5P_PWM2, S5P_PWM4); |