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

Commit ab196b41 authored by Lee Jones's avatar Lee Jones
Browse files

ARM: ux500: Strip out duplicate touch screen platform information 



We're currently carrying two 'struct bu21013_platform_device's which
are identical for no apparent reason. Here we remove the extra burden
and apply the same information to the two different instances of the
bu21012_tp driver registration.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent fa86a764

arch/arm/mach-ux500/board-mop500-stuib.c

+3 −19
Original line number Diff line number Diff line
@@ -162,18 +162,6 @@ static struct bu21013_platform_device tsc_plat_device = { 
	.y_flip = true,

};



static struct bu21013_platform_device tsc_plat2_device = {

	.cs_en = bu21013_gpio_board_init,

	.cs_dis = bu21013_gpio_board_exit,

	.irq_read_val = bu21013_read_pin_val,

	.irq = NOMADIK_GPIO_TO_IRQ(TOUCH_GPIO_PIN),

	.touch_x_max = TOUCH_XMAX,

	.touch_y_max = TOUCH_YMAX,

	.ext_clk = false,

	.x_flip = false,

	.y_flip = true,

};



static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = {

	{

		I2C_BOARD_INFO("bu21013_tp", 0x5C),
@@ -181,21 +169,17 @@ static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = { 
	},

	{

		I2C_BOARD_INFO("bu21013_tp", 0x5D),

		.platform_data = &tsc_plat2_device,

		.platform_data = &tsc_plat_device,

	},



};



void __init mop500_stuib_init(void)

{

	if (machine_is_hrefv60()) {

	if (machine_is_hrefv60())

		tsc_plat_device.cs_pin = HREFV60_TOUCH_RST_GPIO;

		tsc_plat2_device.cs_pin = HREFV60_TOUCH_RST_GPIO;

	} else {

	else

		tsc_plat_device.cs_pin = GPIO_BU21013_CS;

		tsc_plat2_device.cs_pin = GPIO_BU21013_CS;



	}



	mop500_uib_i2c_add(0, mop500_i2c0_devices_stuib,

			ARRAY_SIZE(mop500_i2c0_devices_stuib));