diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-smdk2413.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2413.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c b/arch/arm/mach-s3c24xx/mach-smdk2413.c index 86d7847c9d45..8146e920f10d 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2413.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c | |||
@@ -41,13 +41,13 @@ | |||
41 | #include <linux/platform_data/i2c-s3c2410.h> | 41 | #include <linux/platform_data/i2c-s3c2410.h> |
42 | #include <mach/fb.h> | 42 | #include <mach/fb.h> |
43 | 43 | ||
44 | #include <plat/s3c2410.h> | ||
45 | #include <plat/s3c2412.h> | ||
46 | #include <plat/clock.h> | 44 | #include <plat/clock.h> |
47 | #include <plat/devs.h> | 45 | #include <plat/devs.h> |
48 | #include <plat/cpu.h> | 46 | #include <plat/cpu.h> |
47 | #include <plat/samsung-time.h> | ||
49 | 48 | ||
50 | #include <plat/common-smdk.h> | 49 | #include "common.h" |
50 | #include "common-smdk.h" | ||
51 | 51 | ||
52 | static struct map_desc smdk2413_iodesc[] __initdata = { | 52 | static struct map_desc smdk2413_iodesc[] __initdata = { |
53 | }; | 53 | }; |
@@ -106,6 +106,7 @@ static void __init smdk2413_map_io(void) | |||
106 | s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc)); | 106 | s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc)); |
107 | s3c24xx_init_clocks(12000000); | 107 | s3c24xx_init_clocks(12000000); |
108 | s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs)); | 108 | s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs)); |
109 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
109 | } | 110 | } |
110 | 111 | ||
111 | static void __init smdk2413_machine_init(void) | 112 | static void __init smdk2413_machine_init(void) |
@@ -129,10 +130,10 @@ MACHINE_START(S3C2413, "S3C2413") | |||
129 | .atag_offset = 0x100, | 130 | .atag_offset = 0x100, |
130 | 131 | ||
131 | .fixup = smdk2413_fixup, | 132 | .fixup = smdk2413_fixup, |
132 | .init_irq = s3c24xx_init_irq, | 133 | .init_irq = s3c2412_init_irq, |
133 | .map_io = smdk2413_map_io, | 134 | .map_io = smdk2413_map_io, |
134 | .init_machine = smdk2413_machine_init, | 135 | .init_machine = smdk2413_machine_init, |
135 | .init_time = s3c24xx_timer_init, | 136 | .init_time = samsung_timer_init, |
136 | .restart = s3c2412_restart, | 137 | .restart = s3c2412_restart, |
137 | MACHINE_END | 138 | MACHINE_END |
138 | 139 | ||
@@ -141,10 +142,10 @@ MACHINE_START(SMDK2412, "SMDK2412") | |||
141 | .atag_offset = 0x100, | 142 | .atag_offset = 0x100, |
142 | 143 | ||
143 | .fixup = smdk2413_fixup, | 144 | .fixup = smdk2413_fixup, |
144 | .init_irq = s3c24xx_init_irq, | 145 | .init_irq = s3c2412_init_irq, |
145 | .map_io = smdk2413_map_io, | 146 | .map_io = smdk2413_map_io, |
146 | .init_machine = smdk2413_machine_init, | 147 | .init_machine = smdk2413_machine_init, |
147 | .init_time = s3c24xx_timer_init, | 148 | .init_time = samsung_timer_init, |
148 | .restart = s3c2412_restart, | 149 | .restart = s3c2412_restart, |
149 | MACHINE_END | 150 | MACHINE_END |
150 | 151 | ||
@@ -153,9 +154,9 @@ MACHINE_START(SMDK2413, "SMDK2413") | |||
153 | .atag_offset = 0x100, | 154 | .atag_offset = 0x100, |
154 | 155 | ||
155 | .fixup = smdk2413_fixup, | 156 | .fixup = smdk2413_fixup, |
156 | .init_irq = s3c24xx_init_irq, | 157 | .init_irq = s3c2412_init_irq, |
157 | .map_io = smdk2413_map_io, | 158 | .map_io = smdk2413_map_io, |
158 | .init_machine = smdk2413_machine_init, | 159 | .init_machine = smdk2413_machine_init, |
159 | .init_time = s3c24xx_timer_init, | 160 | .init_time = samsung_timer_init, |
160 | .restart = s3c2412_restart, | 161 | .restart = s3c2412_restart, |
161 | MACHINE_END | 162 | MACHINE_END |