diff options
| author | Kukjin Kim | 2011-12-22 23:31:28 +0100 |
|---|---|---|
| committer | Russell King | 2011-12-23 20:11:19 +0100 |
| commit | dd4153d9af67496f6545831e72c743060d33a830 (patch) | |
| tree | e1ddc02db02db746a4b4f97e7b2026629aa10634 /arch/arm/mach-s5pc100/mach-smdkc100.c | |
| parent | ARM: 7246/1: S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch] (diff) | |
| download | kernel-qcow2-linux-dd4153d9af67496f6545831e72c743060d33a830.tar.gz kernel-qcow2-linux-dd4153d9af67496f6545831e72c743060d33a830.tar.xz kernel-qcow2-linux-dd4153d9af67496f6545831e72c743060d33a830.zip | |
ARM: 7247/1: S5PC100: introduce arch/arm/mach-s5pc100/common.[ch]
This patch introduces common.[ch] which are used only in the
arch/arm/mach-s5pc100/ directory. The common.c file merges
the cpu.c and init.c which are used commonly on S5PC100 SoC
and the common.h local header file replaces with plat/s5pc100.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-s5pc100/mach-smdkc100.c')
| -rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index 26f5c91c9427..e1c41772c7bd 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c @@ -42,7 +42,6 @@ #include <plat/clock.h> #include <plat/devs.h> #include <plat/cpu.h> -#include <plat/s5pc100.h> #include <plat/fb.h> #include <plat/iic.h> #include <plat/ata.h> @@ -53,6 +52,8 @@ #include <plat/backlight.h> #include <plat/regs-fb-v4.h> +#include "common.h" + /* Following are default values for UCON, ULCON and UFCON UART registers */ #define SMDKC100_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ S3C2410_UCON_RXILEVEL | \ @@ -215,7 +216,7 @@ static struct platform_pwm_backlight_data smdkc100_bl_data = { static void __init smdkc100_map_io(void) { - s5p_init_io(NULL, 0, S5P_VA_CHIPID); + s5pc100_init_io(NULL, 0); s3c24xx_init_clocks(12000000); s3c24xx_init_uarts(smdkc100_uartcfgs, ARRAY_SIZE(smdkc100_uartcfgs)); } |