diff options
| author | Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> | 2010-06-30 10:36:47 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:49 -0600 |
| commit | 28a3d903bf102a9fb9ad63bc99db639d6403b202 (patch) | |
| tree | d30d4edec102e8e85193b517ebc5903ada7dc5e4 /arch/arm/mach-ux500/board-mop500.c | |
| parent | 9049d32b0b02b8f1578fbd81baf275cbc088a3ac (diff) | |
bu21013:fix for sim8500 build errors
Fix for sim8500 does not build the touch screen platform data
ST-Ericsson Id: ER 264698
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/1811
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: Icce54040d60cbac3a7d7f2eb48109d0885ba2811
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2806
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rwxr-xr-x | arch/arm/mach-ux500/board-mop500.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index e8147642177..f31fe6183a5 100755 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -120,10 +120,8 @@ static struct gpio_altfun_data gpio_altfun_table[] = { __GPIO_ALT(GPIO_ALT_MMIO_CAM_SET_I2C, 8, 9, 0, NMK_GPIO_ALT_A, "mmio"), __GPIO_ALT(GPIO_ALT_MMIO_CAM_SET_EXT_CLK, 227, 228, 0, NMK_GPIO_ALT_A, "mmio"), -#ifndef CONFIG_U8500_TSC_EXT_CLK_SHARE __GPIO_ALT(GPIO_ALT_TP_SET_EXT_CLK, 228, 228, 0, NMK_GPIO_ALT_A, - "u8500_tp"), -#endif + "bu21013_tp") #ifdef CONFIG_KEYPAD_SKE __GPIO_ALT(GPIO_ALT_KEYPAD, 153, 168, 0, NMK_GPIO_ALT_A, "ske-kp"), #endif @@ -453,6 +451,8 @@ static struct i2c_board_info __initdata nmdk_i2c0_egpio1_devices[] = { } }; +#if defined(CONFIG_TOUCHSCREEN_BU21013) || \ + defined(CONFIG_TOUCHSCREEN_BU21013_MODULE) /** * Touch panel related platform specific initialization */ @@ -719,6 +719,8 @@ static struct bu21013_platform_device tsc_cntl2_plat_device = { .tp_cntl = 2, #endif }; +#endif + /* Portrait */ #ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY /* Rotation always on */ @@ -833,6 +835,8 @@ static struct i2c_board_info __initdata u8500_i2c3_devices[] = { /* NFC - Address TBD, FIXME */ I2C_BOARD_INFO("nfc", 0x68), }, +#if defined(CONFIG_TOUCHSCREEN_BU21013) || \ + defined(CONFIG_TOUCHSCREEN_BU21013_MODULE) { /* Touschscreen */ I2C_BOARD_INFO("bu21013_tp", 0x5C), @@ -843,6 +847,7 @@ static struct i2c_board_info __initdata u8500_i2c3_devices[] = { I2C_BOARD_INFO("bu21013_tp", 0x5D), .platform_data = &tsc_cntl2_plat_device, }, +#endif }; |