diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-real6410.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-real6410.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index 95b04b1729e3..be2a9a22ab74 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/serial_core.h> | 25 | #include <linux/serial_core.h> |
26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
27 | 27 | ||
28 | #include <asm/hardware/vic.h> | ||
28 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
29 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
30 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
@@ -33,7 +34,6 @@ | |||
33 | #include <mach/regs-gpio.h> | 34 | #include <mach/regs-gpio.h> |
34 | #include <mach/regs-modem.h> | 35 | #include <mach/regs-modem.h> |
35 | #include <mach/regs-srom.h> | 36 | #include <mach/regs-srom.h> |
36 | #include <mach/s3c6410.h> | ||
37 | 37 | ||
38 | #include <plat/adc.h> | 38 | #include <plat/adc.h> |
39 | #include <plat/cpu.h> | 39 | #include <plat/cpu.h> |
@@ -46,6 +46,8 @@ | |||
46 | 46 | ||
47 | #include <video/platform_lcd.h> | 47 | #include <video/platform_lcd.h> |
48 | 48 | ||
49 | #include "common.h" | ||
50 | |||
49 | #define UCON S3C2410_UCON_DEFAULT | 51 | #define UCON S3C2410_UCON_DEFAULT |
50 | #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) | 52 | #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB) |
51 | #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE) | 53 | #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE) |
@@ -198,12 +200,6 @@ static struct platform_device *real6410_devices[] __initdata = { | |||
198 | &s3c_device_ohci, | 200 | &s3c_device_ohci, |
199 | }; | 201 | }; |
200 | 202 | ||
201 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | ||
202 | .delay = 10000, | ||
203 | .presc = 49, | ||
204 | .oversampling_shift = 2, | ||
205 | }; | ||
206 | |||
207 | static void __init real6410_map_io(void) | 203 | static void __init real6410_map_io(void) |
208 | { | 204 | { |
209 | u32 tmp; | 205 | u32 tmp; |
@@ -300,7 +296,7 @@ static void __init real6410_machine_init(void) | |||
300 | 296 | ||
301 | s3c_fb_set_platdata(&real6410_lcd_pdata); | 297 | s3c_fb_set_platdata(&real6410_lcd_pdata); |
302 | s3c_nand_set_platdata(&real6410_nand_info); | 298 | s3c_nand_set_platdata(&real6410_nand_info); |
303 | s3c24xx_ts_set_platdata(&s3c_ts_platform); | 299 | s3c24xx_ts_set_platdata(NULL); |
304 | 300 | ||
305 | /* configure nCS1 width to 16 bits */ | 301 | /* configure nCS1 width to 16 bits */ |
306 | 302 | ||
@@ -329,10 +325,12 @@ static void __init real6410_machine_init(void) | |||
329 | 325 | ||
330 | MACHINE_START(REAL6410, "REAL6410") | 326 | MACHINE_START(REAL6410, "REAL6410") |
331 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ | 327 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ |
332 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 328 | .atag_offset = 0x100, |
333 | 329 | ||
334 | .init_irq = s3c6410_init_irq, | 330 | .init_irq = s3c6410_init_irq, |
331 | .handle_irq = vic_handle_irq, | ||
335 | .map_io = real6410_map_io, | 332 | .map_io = real6410_map_io, |
336 | .init_machine = real6410_machine_init, | 333 | .init_machine = real6410_machine_init, |
337 | .timer = &s3c24xx_timer, | 334 | .timer = &s3c24xx_timer, |
335 | .restart = s3c64xx_restart, | ||
338 | MACHINE_END | 336 | MACHINE_END |