diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-mini6410.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-real6410.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 |
3 files changed, 3 insertions, 21 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 527f49bd1b57..8f34a3c10497 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c | |||
@@ -205,12 +205,6 @@ static struct platform_device mini6410_lcd_powerdev = { | |||
205 | .dev.platform_data = &mini6410_lcd_power_data, | 205 | .dev.platform_data = &mini6410_lcd_power_data, |
206 | }; | 206 | }; |
207 | 207 | ||
208 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | ||
209 | .delay = 10000, | ||
210 | .presc = 49, | ||
211 | .oversampling_shift = 2, | ||
212 | }; | ||
213 | |||
214 | static struct platform_device *mini6410_devices[] __initdata = { | 208 | static struct platform_device *mini6410_devices[] __initdata = { |
215 | &mini6410_device_eth, | 209 | &mini6410_device_eth, |
216 | &s3c_device_hsmmc0, | 210 | &s3c_device_hsmmc0, |
@@ -319,7 +313,7 @@ static void __init mini6410_machine_init(void) | |||
319 | 313 | ||
320 | s3c_nand_set_platdata(&mini6410_nand_info); | 314 | s3c_nand_set_platdata(&mini6410_nand_info); |
321 | s3c_fb_set_platdata(&mini6410_lcd_pdata); | 315 | s3c_fb_set_platdata(&mini6410_lcd_pdata); |
322 | s3c24xx_ts_set_platdata(&s3c_ts_platform); | 316 | s3c24xx_ts_set_platdata(NULL); |
323 | 317 | ||
324 | /* configure nCS1 width to 16 bits */ | 318 | /* configure nCS1 width to 16 bits */ |
325 | 319 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index 95b04b1729e3..1f5abfae4eac 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -198,12 +198,6 @@ static struct platform_device *real6410_devices[] __initdata = { | |||
198 | &s3c_device_ohci, | 198 | &s3c_device_ohci, |
199 | }; | 199 | }; |
200 | 200 | ||
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) | 201 | static void __init real6410_map_io(void) |
208 | { | 202 | { |
209 | u32 tmp; | 203 | u32 tmp; |
@@ -300,7 +294,7 @@ static void __init real6410_machine_init(void) | |||
300 | 294 | ||
301 | s3c_fb_set_platdata(&real6410_lcd_pdata); | 295 | s3c_fb_set_platdata(&real6410_lcd_pdata); |
302 | s3c_nand_set_platdata(&real6410_nand_info); | 296 | s3c_nand_set_platdata(&real6410_nand_info); |
303 | s3c24xx_ts_set_platdata(&s3c_ts_platform); | 297 | s3c24xx_ts_set_platdata(NULL); |
304 | 298 | ||
305 | /* configure nCS1 width to 16 bits */ | 299 | /* configure nCS1 width to 16 bits */ |
306 | 300 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index ecbea92bf83b..c5190a50f0d9 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -658,12 +658,6 @@ static struct i2c_board_info i2c_devs1[] __initdata = { | |||
658 | { I2C_BOARD_INFO("24c128", 0x57), }, /* Samsung S524AD0XD1 */ | 658 | { I2C_BOARD_INFO("24c128", 0x57), }, /* Samsung S524AD0XD1 */ |
659 | }; | 659 | }; |
660 | 660 | ||
661 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | ||
662 | .delay = 10000, | ||
663 | .presc = 49, | ||
664 | .oversampling_shift = 2, | ||
665 | }; | ||
666 | |||
667 | /* LCD Backlight data */ | 661 | /* LCD Backlight data */ |
668 | static struct samsung_bl_gpio_info smdk6410_bl_gpio_info = { | 662 | static struct samsung_bl_gpio_info smdk6410_bl_gpio_info = { |
669 | .no = S3C64XX_GPF(15), | 663 | .no = S3C64XX_GPF(15), |
@@ -705,7 +699,7 @@ static void __init smdk6410_machine_init(void) | |||
705 | 699 | ||
706 | samsung_keypad_set_platdata(&smdk6410_keypad_data); | 700 | samsung_keypad_set_platdata(&smdk6410_keypad_data); |
707 | 701 | ||
708 | s3c24xx_ts_set_platdata(&s3c_ts_platform); | 702 | s3c24xx_ts_set_platdata(NULL); |
709 | 703 | ||
710 | /* configure nCS1 width to 16 bits */ | 704 | /* configure nCS1 width to 16 bits */ |
711 | 705 | ||