diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-anw6410.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-hmt.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-mini6410.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-ncp.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-real6410.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq5.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq7.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6400.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 |
12 files changed, 32 insertions, 10 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 131c86284711..283cb77d4721 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig | |||
@@ -17,11 +17,13 @@ config PLAT_S3C64XX | |||
17 | # Configuration options for the S3C6410 CPU | 17 | # Configuration options for the S3C6410 CPU |
18 | 18 | ||
19 | config CPU_S3C6400 | 19 | config CPU_S3C6400 |
20 | select SAMSUNG_HRT | ||
20 | bool | 21 | bool |
21 | help | 22 | help |
22 | Enable S3C6400 CPU support | 23 | Enable S3C6400 CPU support |
23 | 24 | ||
24 | config CPU_S3C6410 | 25 | config CPU_S3C6410 |
26 | select SAMSUNG_HRT | ||
25 | bool | 27 | bool |
26 | help | 28 | help |
27 | Enable S3C6410 CPU support | 29 | Enable S3C6410 CPU support |
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index 728eef3296b2..35e3f54574ef 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <plat/devs.h> | 49 | #include <plat/devs.h> |
50 | #include <plat/cpu.h> | 50 | #include <plat/cpu.h> |
51 | #include <mach/regs-gpio.h> | 51 | #include <mach/regs-gpio.h> |
52 | #include <plat/samsung-time.h> | ||
52 | 53 | ||
53 | #include "common.h" | 54 | #include "common.h" |
54 | #include "regs-modem.h" | 55 | #include "regs-modem.h" |
@@ -208,6 +209,7 @@ static void __init anw6410_map_io(void) | |||
208 | s3c64xx_init_io(anw6410_iodesc, ARRAY_SIZE(anw6410_iodesc)); | 209 | s3c64xx_init_io(anw6410_iodesc, ARRAY_SIZE(anw6410_iodesc)); |
209 | s3c24xx_init_clocks(12000000); | 210 | s3c24xx_init_clocks(12000000); |
210 | s3c24xx_init_uarts(anw6410_uartcfgs, ARRAY_SIZE(anw6410_uartcfgs)); | 211 | s3c24xx_init_uarts(anw6410_uartcfgs, ARRAY_SIZE(anw6410_uartcfgs)); |
212 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
211 | 213 | ||
212 | anw6410_lcd_mode_set(); | 214 | anw6410_lcd_mode_set(); |
213 | } | 215 | } |
@@ -232,6 +234,6 @@ MACHINE_START(ANW6410, "A&W6410") | |||
232 | .map_io = anw6410_map_io, | 234 | .map_io = anw6410_map_io, |
233 | .init_machine = anw6410_machine_init, | 235 | .init_machine = anw6410_machine_init, |
234 | .init_late = s3c64xx_init_late, | 236 | .init_late = s3c64xx_init_late, |
235 | .init_time = s3c24xx_timer_init, | 237 | .init_time = samsung_timer_init, |
236 | .restart = s3c64xx_restart, | 238 | .restart = s3c64xx_restart, |
237 | MACHINE_END | 239 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 1acf02bace57..8ad88ace795a 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -64,6 +64,7 @@ | |||
64 | #include <plat/adc.h> | 64 | #include <plat/adc.h> |
65 | #include <linux/platform_data/i2c-s3c2410.h> | 65 | #include <linux/platform_data/i2c-s3c2410.h> |
66 | #include <plat/pm.h> | 66 | #include <plat/pm.h> |
67 | #include <plat/samsung-time.h> | ||
67 | 68 | ||
68 | #include "common.h" | 69 | #include "common.h" |
69 | #include "crag6410.h" | 70 | #include "crag6410.h" |
@@ -744,6 +745,7 @@ static void __init crag6410_map_io(void) | |||
744 | s3c64xx_init_io(NULL, 0); | 745 | s3c64xx_init_io(NULL, 0); |
745 | s3c24xx_init_clocks(12000000); | 746 | s3c24xx_init_clocks(12000000); |
746 | s3c24xx_init_uarts(crag6410_uartcfgs, ARRAY_SIZE(crag6410_uartcfgs)); | 747 | s3c24xx_init_uarts(crag6410_uartcfgs, ARRAY_SIZE(crag6410_uartcfgs)); |
748 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
747 | 749 | ||
748 | /* LCD type and Bypass set by bootloader */ | 750 | /* LCD type and Bypass set by bootloader */ |
749 | } | 751 | } |
@@ -868,6 +870,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") | |||
868 | .map_io = crag6410_map_io, | 870 | .map_io = crag6410_map_io, |
869 | .init_machine = crag6410_machine_init, | 871 | .init_machine = crag6410_machine_init, |
870 | .init_late = s3c64xx_init_late, | 872 | .init_late = s3c64xx_init_late, |
871 | .init_time = s3c24xx_timer_init, | 873 | .init_time = samsung_timer_init, |
872 | .restart = s3c64xx_restart, | 874 | .restart = s3c64xx_restart, |
873 | MACHINE_END | 875 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 7212eb9cfeb9..5b7f357d8c22 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <plat/clock.h> | 41 | #include <plat/clock.h> |
42 | #include <plat/devs.h> | 42 | #include <plat/devs.h> |
43 | #include <plat/cpu.h> | 43 | #include <plat/cpu.h> |
44 | #include <plat/samsung-time.h> | ||
44 | 45 | ||
45 | #include "common.h" | 46 | #include "common.h" |
46 | 47 | ||
@@ -248,6 +249,7 @@ static void __init hmt_map_io(void) | |||
248 | s3c64xx_init_io(hmt_iodesc, ARRAY_SIZE(hmt_iodesc)); | 249 | s3c64xx_init_io(hmt_iodesc, ARRAY_SIZE(hmt_iodesc)); |
249 | s3c24xx_init_clocks(12000000); | 250 | s3c24xx_init_clocks(12000000); |
250 | s3c24xx_init_uarts(hmt_uartcfgs, ARRAY_SIZE(hmt_uartcfgs)); | 251 | s3c24xx_init_uarts(hmt_uartcfgs, ARRAY_SIZE(hmt_uartcfgs)); |
252 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
251 | } | 253 | } |
252 | 254 | ||
253 | static void __init hmt_machine_init(void) | 255 | static void __init hmt_machine_init(void) |
@@ -275,6 +277,6 @@ MACHINE_START(HMT, "Airgoo-HMT") | |||
275 | .map_io = hmt_map_io, | 277 | .map_io = hmt_map_io, |
276 | .init_machine = hmt_machine_init, | 278 | .init_machine = hmt_machine_init, |
277 | .init_late = s3c64xx_init_late, | 279 | .init_late = s3c64xx_init_late, |
278 | .init_time = s3c24xx_timer_init, | 280 | .init_time = samsung_timer_init, |
279 | .restart = s3c64xx_restart, | 281 | .restart = s3c64xx_restart, |
280 | MACHINE_END | 282 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 4b41fcdaa7b6..fc043e3ecdf8 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c | |||
@@ -41,6 +41,7 @@ | |||
41 | 41 | ||
42 | #include <video/platform_lcd.h> | 42 | #include <video/platform_lcd.h> |
43 | #include <video/samsung_fimd.h> | 43 | #include <video/samsung_fimd.h> |
44 | #include <plat/samsung-time.h> | ||
44 | 45 | ||
45 | #include "common.h" | 46 | #include "common.h" |
46 | #include "regs-modem.h" | 47 | #include "regs-modem.h" |
@@ -232,6 +233,7 @@ static void __init mini6410_map_io(void) | |||
232 | s3c64xx_init_io(NULL, 0); | 233 | s3c64xx_init_io(NULL, 0); |
233 | s3c24xx_init_clocks(12000000); | 234 | s3c24xx_init_clocks(12000000); |
234 | s3c24xx_init_uarts(mini6410_uartcfgs, ARRAY_SIZE(mini6410_uartcfgs)); | 235 | s3c24xx_init_uarts(mini6410_uartcfgs, ARRAY_SIZE(mini6410_uartcfgs)); |
236 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
235 | 237 | ||
236 | /* set the LCD type */ | 238 | /* set the LCD type */ |
237 | tmp = __raw_readl(S3C64XX_SPCON); | 239 | tmp = __raw_readl(S3C64XX_SPCON); |
@@ -354,6 +356,6 @@ MACHINE_START(MINI6410, "MINI6410") | |||
354 | .map_io = mini6410_map_io, | 356 | .map_io = mini6410_map_io, |
355 | .init_machine = mini6410_machine_init, | 357 | .init_machine = mini6410_machine_init, |
356 | .init_late = s3c64xx_init_late, | 358 | .init_late = s3c64xx_init_late, |
357 | .init_time = s3c24xx_timer_init, | 359 | .init_time = samsung_timer_init, |
358 | .restart = s3c64xx_restart, | 360 | .restart = s3c64xx_restart, |
359 | MACHINE_END | 361 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c index 8d3cedd995ff..7e2c3908f1f8 100644 --- a/arch/arm/mach-s3c64xx/mach-ncp.c +++ b/arch/arm/mach-s3c64xx/mach-ncp.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <plat/clock.h> | 43 | #include <plat/clock.h> |
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | #include <plat/samsung-time.h> | ||
46 | 47 | ||
47 | #include "common.h" | 48 | #include "common.h" |
48 | 49 | ||
@@ -87,6 +88,7 @@ static void __init ncp_map_io(void) | |||
87 | s3c64xx_init_io(ncp_iodesc, ARRAY_SIZE(ncp_iodesc)); | 88 | s3c64xx_init_io(ncp_iodesc, ARRAY_SIZE(ncp_iodesc)); |
88 | s3c24xx_init_clocks(12000000); | 89 | s3c24xx_init_clocks(12000000); |
89 | s3c24xx_init_uarts(ncp_uartcfgs, ARRAY_SIZE(ncp_uartcfgs)); | 90 | s3c24xx_init_uarts(ncp_uartcfgs, ARRAY_SIZE(ncp_uartcfgs)); |
91 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
90 | } | 92 | } |
91 | 93 | ||
92 | static void __init ncp_machine_init(void) | 94 | static void __init ncp_machine_init(void) |
@@ -103,6 +105,6 @@ MACHINE_START(NCP, "NCP") | |||
103 | .map_io = ncp_map_io, | 105 | .map_io = ncp_map_io, |
104 | .init_machine = ncp_machine_init, | 106 | .init_machine = ncp_machine_init, |
105 | .init_late = s3c64xx_init_late, | 107 | .init_late = s3c64xx_init_late, |
106 | .init_time = s3c24xx_timer_init, | 108 | .init_time = samsung_timer_init, |
107 | .restart = s3c64xx_restart, | 109 | .restart = s3c64xx_restart, |
108 | MACHINE_END | 110 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index fa12bd21ad82..8bed37b3d5ac 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -42,6 +42,7 @@ | |||
42 | 42 | ||
43 | #include <video/platform_lcd.h> | 43 | #include <video/platform_lcd.h> |
44 | #include <video/samsung_fimd.h> | 44 | #include <video/samsung_fimd.h> |
45 | #include <plat/samsung-time.h> | ||
45 | 46 | ||
46 | #include "common.h" | 47 | #include "common.h" |
47 | #include "regs-modem.h" | 48 | #include "regs-modem.h" |
@@ -211,6 +212,7 @@ static void __init real6410_map_io(void) | |||
211 | s3c64xx_init_io(NULL, 0); | 212 | s3c64xx_init_io(NULL, 0); |
212 | s3c24xx_init_clocks(12000000); | 213 | s3c24xx_init_clocks(12000000); |
213 | s3c24xx_init_uarts(real6410_uartcfgs, ARRAY_SIZE(real6410_uartcfgs)); | 214 | s3c24xx_init_uarts(real6410_uartcfgs, ARRAY_SIZE(real6410_uartcfgs)); |
215 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
214 | 216 | ||
215 | /* set the LCD type */ | 217 | /* set the LCD type */ |
216 | tmp = __raw_readl(S3C64XX_SPCON); | 218 | tmp = __raw_readl(S3C64XX_SPCON); |
@@ -333,6 +335,6 @@ MACHINE_START(REAL6410, "REAL6410") | |||
333 | .map_io = real6410_map_io, | 335 | .map_io = real6410_map_io, |
334 | .init_machine = real6410_machine_init, | 336 | .init_machine = real6410_machine_init, |
335 | .init_late = s3c64xx_init_late, | 337 | .init_late = s3c64xx_init_late, |
336 | .init_time = s3c24xx_timer_init, | 338 | .init_time = samsung_timer_init, |
337 | .restart = s3c64xx_restart, | 339 | .restart = s3c64xx_restart, |
338 | MACHINE_END | 340 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c index fc3e9b32e26f..58ac99041274 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/arch/arm/mach-s3c64xx/mach-smartq.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/platform_data/touchscreen-s3c2410.h> | 38 | #include <linux/platform_data/touchscreen-s3c2410.h> |
39 | 39 | ||
40 | #include <video/platform_lcd.h> | 40 | #include <video/platform_lcd.h> |
41 | #include <plat/samsung-time.h> | ||
41 | 42 | ||
42 | #include "common.h" | 43 | #include "common.h" |
43 | #include "regs-modem.h" | 44 | #include "regs-modem.h" |
@@ -378,6 +379,7 @@ void __init smartq_map_io(void) | |||
378 | s3c64xx_init_io(smartq_iodesc, ARRAY_SIZE(smartq_iodesc)); | 379 | s3c64xx_init_io(smartq_iodesc, ARRAY_SIZE(smartq_iodesc)); |
379 | s3c24xx_init_clocks(12000000); | 380 | s3c24xx_init_clocks(12000000); |
380 | s3c24xx_init_uarts(smartq_uartcfgs, ARRAY_SIZE(smartq_uartcfgs)); | 381 | s3c24xx_init_uarts(smartq_uartcfgs, ARRAY_SIZE(smartq_uartcfgs)); |
382 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
381 | 383 | ||
382 | smartq_lcd_mode_set(); | 384 | smartq_lcd_mode_set(); |
383 | } | 385 | } |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c index ca2afcfce573..8aca5daf3d05 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq5.c +++ b/arch/arm/mach-s3c64xx/mach-smartq5.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <plat/devs.h> | 28 | #include <plat/devs.h> |
29 | #include <plat/fb.h> | 29 | #include <plat/fb.h> |
30 | #include <plat/gpio-cfg.h> | 30 | #include <plat/gpio-cfg.h> |
31 | #include <plat/samsung-time.h> | ||
31 | 32 | ||
32 | #include "common.h" | 33 | #include "common.h" |
33 | #include "mach-smartq.h" | 34 | #include "mach-smartq.h" |
@@ -155,6 +156,6 @@ MACHINE_START(SMARTQ5, "SmartQ 5") | |||
155 | .map_io = smartq_map_io, | 156 | .map_io = smartq_map_io, |
156 | .init_machine = smartq5_machine_init, | 157 | .init_machine = smartq5_machine_init, |
157 | .init_late = s3c64xx_init_late, | 158 | .init_late = s3c64xx_init_late, |
158 | .init_time = s3c24xx_timer_init, | 159 | .init_time = samsung_timer_init, |
159 | .restart = s3c64xx_restart, | 160 | .restart = s3c64xx_restart, |
160 | MACHINE_END | 161 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c index 37bb0c632a5e..a052e107c0b4 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq7.c +++ b/arch/arm/mach-s3c64xx/mach-smartq7.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <plat/devs.h> | 28 | #include <plat/devs.h> |
29 | #include <plat/fb.h> | 29 | #include <plat/fb.h> |
30 | #include <plat/gpio-cfg.h> | 30 | #include <plat/gpio-cfg.h> |
31 | #include <plat/samsung-time.h> | ||
31 | 32 | ||
32 | #include "common.h" | 33 | #include "common.h" |
33 | #include "mach-smartq.h" | 34 | #include "mach-smartq.h" |
@@ -171,6 +172,6 @@ MACHINE_START(SMARTQ7, "SmartQ 7") | |||
171 | .map_io = smartq_map_io, | 172 | .map_io = smartq_map_io, |
172 | .init_machine = smartq7_machine_init, | 173 | .init_machine = smartq7_machine_init, |
173 | .init_late = s3c64xx_init_late, | 174 | .init_late = s3c64xx_init_late, |
174 | .init_time = s3c24xx_timer_init, | 175 | .init_time = samsung_timer_init, |
175 | .restart = s3c64xx_restart, | 176 | .restart = s3c64xx_restart, |
176 | MACHINE_END | 177 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c index a392869c8342..d70c0843aea2 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <plat/devs.h> | 35 | #include <plat/devs.h> |
36 | #include <plat/cpu.h> | 36 | #include <plat/cpu.h> |
37 | #include <linux/platform_data/i2c-s3c2410.h> | 37 | #include <linux/platform_data/i2c-s3c2410.h> |
38 | #include <plat/samsung-time.h> | ||
38 | 39 | ||
39 | #include "common.h" | 40 | #include "common.h" |
40 | 41 | ||
@@ -66,6 +67,7 @@ static void __init smdk6400_map_io(void) | |||
66 | s3c64xx_init_io(smdk6400_iodesc, ARRAY_SIZE(smdk6400_iodesc)); | 67 | s3c64xx_init_io(smdk6400_iodesc, ARRAY_SIZE(smdk6400_iodesc)); |
67 | s3c24xx_init_clocks(12000000); | 68 | s3c24xx_init_clocks(12000000); |
68 | s3c24xx_init_uarts(smdk6400_uartcfgs, ARRAY_SIZE(smdk6400_uartcfgs)); | 69 | s3c24xx_init_uarts(smdk6400_uartcfgs, ARRAY_SIZE(smdk6400_uartcfgs)); |
70 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
69 | } | 71 | } |
70 | 72 | ||
71 | static struct platform_device *smdk6400_devices[] __initdata = { | 73 | static struct platform_device *smdk6400_devices[] __initdata = { |
@@ -92,6 +94,6 @@ MACHINE_START(SMDK6400, "SMDK6400") | |||
92 | .map_io = smdk6400_map_io, | 94 | .map_io = smdk6400_map_io, |
93 | .init_machine = smdk6400_machine_init, | 95 | .init_machine = smdk6400_machine_init, |
94 | .init_late = s3c64xx_init_late, | 96 | .init_late = s3c64xx_init_late, |
95 | .init_time = s3c24xx_timer_init, | 97 | .init_time = samsung_timer_init, |
96 | .restart = s3c64xx_restart, | 98 | .restart = s3c64xx_restart, |
97 | MACHINE_END | 99 | MACHINE_END |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index ba7544e2d04d..bd3295a19ad7 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -69,6 +69,7 @@ | |||
69 | #include <linux/platform_data/touchscreen-s3c2410.h> | 69 | #include <linux/platform_data/touchscreen-s3c2410.h> |
70 | #include <plat/keypad.h> | 70 | #include <plat/keypad.h> |
71 | #include <plat/backlight.h> | 71 | #include <plat/backlight.h> |
72 | #include <plat/samsung-time.h> | ||
72 | 73 | ||
73 | #include "common.h" | 74 | #include "common.h" |
74 | #include "regs-modem.h" | 75 | #include "regs-modem.h" |
@@ -634,6 +635,7 @@ static void __init smdk6410_map_io(void) | |||
634 | s3c64xx_init_io(smdk6410_iodesc, ARRAY_SIZE(smdk6410_iodesc)); | 635 | s3c64xx_init_io(smdk6410_iodesc, ARRAY_SIZE(smdk6410_iodesc)); |
635 | s3c24xx_init_clocks(12000000); | 636 | s3c24xx_init_clocks(12000000); |
636 | s3c24xx_init_uarts(smdk6410_uartcfgs, ARRAY_SIZE(smdk6410_uartcfgs)); | 637 | s3c24xx_init_uarts(smdk6410_uartcfgs, ARRAY_SIZE(smdk6410_uartcfgs)); |
638 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
637 | 639 | ||
638 | /* set the LCD type */ | 640 | /* set the LCD type */ |
639 | 641 | ||
@@ -702,6 +704,6 @@ MACHINE_START(SMDK6410, "SMDK6410") | |||
702 | .map_io = smdk6410_map_io, | 704 | .map_io = smdk6410_map_io, |
703 | .init_machine = smdk6410_machine_init, | 705 | .init_machine = smdk6410_machine_init, |
704 | .init_late = s3c64xx_init_late, | 706 | .init_late = s3c64xx_init_late, |
705 | .init_time = s3c24xx_timer_init, | 707 | .init_time = samsung_timer_init, |
706 | .restart = s3c64xx_restart, | 708 | .restart = s3c64xx_restart, |
707 | MACHINE_END | 709 | MACHINE_END |