Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0804765a authored by Naveen Krishna Chatradhi's avatar Naveen Krishna Chatradhi Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Remove unnecessary duplication of plat_data on TSADC 



The default plat_data struct for TSADC is added in devs-ts.c
and duplication is removed from the following machines.

Signed-off-by: default avatarNaveen Krishna Chatradhi <ch.naveen@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 5e8e0a10

arch/arm/mach-s3c64xx/mach-mini6410.c

+1 −7
Original line number Diff line number Diff line
@@ -205,12 +205,6 @@ static struct platform_device mini6410_lcd_powerdev = { 
	.dev.platform_data	= &mini6410_lcd_power_data,

};



static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

	.delay			= 10000,

	.presc			= 49,

	.oversampling_shift	= 2,

};



static struct platform_device *mini6410_devices[] __initdata = {

	&mini6410_device_eth,

	&s3c_device_hsmmc0,
@@ -319,7 +313,7 @@ static void __init mini6410_machine_init(void) 


	s3c_nand_set_platdata(&mini6410_nand_info);

	s3c_fb_set_platdata(&mini6410_lcd_pdata);

	s3c24xx_ts_set_platdata(&s3c_ts_platform);

	s3c24xx_ts_set_platdata(NULL);



	/* configure nCS1 width to 16 bits */

arch/arm/mach-s3c64xx/mach-real6410.c

+1 −7
Original line number Diff line number Diff line
@@ -198,12 +198,6 @@ static struct platform_device *real6410_devices[] __initdata = { 
	&s3c_device_ohci,

};



static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

	.delay			= 10000,

	.presc			= 49,

	.oversampling_shift	= 2,

};



static void __init real6410_map_io(void)

{

	u32 tmp;
@@ -300,7 +294,7 @@ static void __init real6410_machine_init(void) 


	s3c_fb_set_platdata(&real6410_lcd_pdata);

	s3c_nand_set_platdata(&real6410_nand_info);

	s3c24xx_ts_set_platdata(&s3c_ts_platform);

	s3c24xx_ts_set_platdata(NULL);



	/* configure nCS1 width to 16 bits */

arch/arm/mach-s3c64xx/mach-smdk6410.c

+1 −7
Original line number Diff line number Diff line
@@ -658,12 +658,6 @@ static struct i2c_board_info i2c_devs1[] __initdata = { 
	{ I2C_BOARD_INFO("24c128", 0x57), },	/* Samsung S524AD0XD1 */

};



static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

	.delay			= 10000,

	.presc			= 49,

	.oversampling_shift	= 2,

};



/* LCD Backlight data */

static struct samsung_bl_gpio_info smdk6410_bl_gpio_info = {

	.no = S3C64XX_GPF(15),
@@ -705,7 +699,7 @@ static void __init smdk6410_machine_init(void) 


	samsung_keypad_set_platdata(&smdk6410_keypad_data);



	s3c24xx_ts_set_platdata(&s3c_ts_platform);

	s3c24xx_ts_set_platdata(NULL);



	/* configure nCS1 width to 16 bits */

arch/arm/mach-s5p64x0/mach-smdk6440.c

+1 −7
Original line number Diff line number Diff line
@@ -129,12 +129,6 @@ static struct i2c_board_info smdk6440_i2c_devs1[] __initdata = { 
	/* To be populated */

};



static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

	.delay			= 10000,

	.presc			= 49,

	.oversampling_shift	= 2,

};



/* LCD Backlight data */

static struct samsung_bl_gpio_info smdk6440_bl_gpio_info = {

	.no = S5P6440_GPF(15),
@@ -155,7 +149,7 @@ static void __init smdk6440_map_io(void) 


static void __init smdk6440_machine_init(void)

{

	s3c24xx_ts_set_platdata(&s3c_ts_platform);

	s3c24xx_ts_set_platdata(NULL);



	s3c_i2c0_set_platdata(&s5p6440_i2c0_data);

	s3c_i2c1_set_platdata(&s5p6440_i2c1_data);

arch/arm/mach-s5p64x0/mach-smdk6450.c

+1 −7
Original line number Diff line number Diff line
@@ -148,12 +148,6 @@ static struct i2c_board_info smdk6450_i2c_devs1[] __initdata = { 
	{ I2C_BOARD_INFO("24c128", 0x57), },/* Samsung S524AD0XD1 EEPROM */

};



static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

	.delay			= 10000,

	.presc			= 49,

	.oversampling_shift	= 2,

};



/* LCD Backlight data */

static struct samsung_bl_gpio_info smdk6450_bl_gpio_info = {

	.no = S5P6450_GPF(15),
@@ -174,7 +168,7 @@ static void __init smdk6450_map_io(void) 


static void __init smdk6450_machine_init(void)

{

	s3c24xx_ts_set_platdata(&s3c_ts_platform);

	s3c24xx_ts_set_platdata(NULL);



	s3c_i2c0_set_platdata(&s5p6450_i2c0_data);

	s3c_i2c1_set_platdata(&s5p6450_i2c1_data);