aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/mach-torbreck.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-12-22 17:32:07 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-23 14:11:28 -0500
commit3fa754c298b7e6fcbdbe615d6b609117fa7e0de9 (patch)
treeaebfe49d8b77a839f73c7c32e69e364a28103513 /arch/arm/mach-s5pv210/mach-torbreck.c
parentdd4153d9af67496f6545831e72c743060d33a830 (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-torbreck.c')
-rw-r--r--arch/arm/mach-s5pv210/mach-torbreck.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c
index 97cc066c5369..1669fe607d49 100644
--- a/arch/arm/mach-s5pv210/mach-torbreck.c
+++ b/arch/arm/mach-s5pv210/mach-torbreck.c
@@ -23,12 +23,13 @@
23#include <mach/regs-clock.h> 23#include <mach/regs-clock.h>
24 24
25#include <plat/regs-serial.h> 25#include <plat/regs-serial.h>
26#include <plat/s5pv210.h>
27#include <plat/devs.h> 26#include <plat/devs.h>
28#include <plat/cpu.h> 27#include <plat/cpu.h>
29#include <plat/iic.h> 28#include <plat/iic.h>
30#include <plat/s5p-time.h> 29#include <plat/s5p-time.h>
31 30
31#include "common.h"
32
32/* Following are default values for UCON, ULCON and UFCON UART registers */ 33/* Following are default values for UCON, ULCON and UFCON UART registers */
33#define TORBRECK_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ 34#define TORBRECK_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
34 S3C2410_UCON_RXILEVEL | \ 35 S3C2410_UCON_RXILEVEL | \
@@ -102,7 +103,7 @@ static struct i2c_board_info torbreck_i2c_devs2[] __initdata = {
102 103
103static void __init torbreck_map_io(void) 104static void __init torbreck_map_io(void)
104{ 105{
105 s5p_init_io(NULL, 0, S5P_VA_CHIPID); 106 s5pv210_init_io(NULL, 0);
106 s3c24xx_init_clocks(24000000); 107 s3c24xx_init_clocks(24000000);
107 s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs)); 108 s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs));
108 s5p_set_timer_source(S5P_PWM3, S5P_PWM4); 109 s5p_set_timer_source(S5P_PWM3, S5P_PWM4);