diff options
author | Romain Naour <romain.naour@openwide.fr> | 2013-01-09 21:47:04 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-05 06:19:54 -0500 |
commit | 6a5a2e3b0dee0e26edeef448d7f097a2109b56bc (patch) | |
tree | 9619e26098ed2180b70f34e1e900f2a576461c98 /arch/arm/mach-s5pc100 | |
parent | 04a49b710d436ac977d3db41ae8ad23fe800a30b (diff) |
ARM: S5PC100: Add samsung-time support for s5pc100
Signed-off-by: Naour Romain <romain.naour@openwide.fr>
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r-- | arch/arm/mach-s5pc100/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig index 15170be97a74..2f456a4533ba 100644 --- a/arch/arm/mach-s5pc100/Kconfig +++ b/arch/arm/mach-s5pc100/Kconfig | |||
@@ -11,6 +11,7 @@ config CPU_S5PC100 | |||
11 | bool | 11 | bool |
12 | select S5P_EXT_INT | 12 | select S5P_EXT_INT |
13 | select SAMSUNG_DMADEV | 13 | select SAMSUNG_DMADEV |
14 | select SAMSUNG_HRT | ||
14 | help | 15 | help |
15 | Enable S5PC100 CPU support | 16 | Enable S5PC100 CPU support |
16 | 17 | ||
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index 185a19583898..8c880f76f274 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include <linux/platform_data/touchscreen-s3c2410.h> | 51 | #include <linux/platform_data/touchscreen-s3c2410.h> |
52 | #include <linux/platform_data/asoc-s3c.h> | 52 | #include <linux/platform_data/asoc-s3c.h> |
53 | #include <plat/backlight.h> | 53 | #include <plat/backlight.h> |
54 | #include <plat/samsung-time.h> | ||
54 | 55 | ||
55 | #include "common.h" | 56 | #include "common.h" |
56 | 57 | ||
@@ -221,6 +222,7 @@ static void __init smdkc100_map_io(void) | |||
221 | s5pc100_init_io(NULL, 0); | 222 | s5pc100_init_io(NULL, 0); |
222 | s3c24xx_init_clocks(12000000); | 223 | s3c24xx_init_clocks(12000000); |
223 | s3c24xx_init_uarts(smdkc100_uartcfgs, ARRAY_SIZE(smdkc100_uartcfgs)); | 224 | s3c24xx_init_uarts(smdkc100_uartcfgs, ARRAY_SIZE(smdkc100_uartcfgs)); |
225 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
224 | } | 226 | } |
225 | 227 | ||
226 | static void __init smdkc100_machine_init(void) | 228 | static void __init smdkc100_machine_init(void) |
@@ -255,6 +257,6 @@ MACHINE_START(SMDKC100, "SMDKC100") | |||
255 | .init_irq = s5pc100_init_irq, | 257 | .init_irq = s5pc100_init_irq, |
256 | .map_io = smdkc100_map_io, | 258 | .map_io = smdkc100_map_io, |
257 | .init_machine = smdkc100_machine_init, | 259 | .init_machine = smdkc100_machine_init, |
258 | .init_time = s3c24xx_timer_init, | 260 | .init_time = samsung_timer_init, |
259 | .restart = s5pc100_restart, | 261 | .restart = s5pc100_restart, |
260 | MACHINE_END | 262 | MACHINE_END |