Skip to content

Commit

Permalink
ARM: ux500: Strip out duplicate touch screen platform information
Browse files Browse the repository at this point in the history
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: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Lee Jones committed Nov 1, 2012
1 parent fa86a76 commit ab196b4
Showing 1 changed file with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions arch/arm/mach-ux500/board-mop500-stuib.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,40 +162,24 @@ 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),
.platform_data = &tsc_plat_device,
},
{
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));
Expand Down

0 comments on commit ab196b4

Please sign in to comment.