diff options
| author | Rajat Verma <rajat.verma@stericsson.com> | 2012-01-11 16:19:02 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:42 +0200 |
| commit | 51a4de5640552d3cb78958608ea4874817239a0f (patch) | |
| tree | 9f23110c4951ea3e49c9d0c128cf2c81090f91c3 | |
| parent | c80670f701231a10edb109c6b69af461101613be (diff) | |
mach-ux500: Add platform data for ADP1653 in R3UIB
Platform specific data for camera flash chip ADP1653
has been added in R3UIB board configuration file.
ST-Ericsson Linux next: NA
ST-Ericsson ID: 375189
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ib5f622fe41b48ebd231fe5f296311f82059b84e3
Signed-off-by: Rajat Verma <rajat.verma@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45185
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: QATEST
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rwxr-xr-x | arch/arm/mach-ux500/board-mop500-cyttsp.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-cyttsp.c b/arch/arm/mach-ux500/board-mop500-cyttsp.c index 2bfa9fb17fa..8aca8bef5ad 100755 --- a/arch/arm/mach-ux500/board-mop500-cyttsp.c +++ b/arch/arm/mach-ux500/board-mop500-cyttsp.c @@ -11,6 +11,7 @@ #include <linux/delay.h> #include <linux/gpio/nomadik.h> #include <linux/i2c.h> +#include <linux/i2c/adp1653_plat.h> #include <linux/input/matrix_keypad.h> #include <linux/mfd/tc3589x.h> #include <linux/mfd/dbx500-prcmu.h> @@ -26,6 +27,17 @@ #define NUM_SSP_CLIENTS 10 +static struct adp1653_platform_data __initdata adp1653_pdata_u8500_uib = { + .irq_no = CAMERA_FLASH_INT_PIN +}; + +static struct i2c_board_info __initdata mop500_i2c2_devices_u8500_r3[] = { + { + I2C_BOARD_INFO("adp1653", 0x30), + .platform_data = &adp1653_pdata_u8500_uib + } +}; + /* cyttsp_gpio_board_init : configures the touch panel. */ static int cyttsp_plat_init(int on) { @@ -220,8 +232,17 @@ void __init mop500_u8500uib_r3_init(void) mop500_cyttsp_init(); db8500_add_spi2(&mop500_spi2_data); nmk_config_pin((GPIO64_GPIO | PIN_INPUT_PULLUP), false); + if (machine_is_hrefv60()) { + adp1653_pdata_u8500_uib.enable_gpio = + HREFV60_CAMERA_FLASH_ENABLE; + } else { + adp1653_pdata_u8500_uib.enable_gpio = + GPIO_CAMERA_FLASH_ENABLE; + } mop500_uib_i2c_add(0, mop500_i2c0_devices_u8500, ARRAY_SIZE(mop500_i2c0_devices_u8500)); mop500_uib_i2c_add(0, mop500_i2c0_devices_u8500, ARRAY_SIZE(mop500_i2c0_devices_u8500)); + mop500_uib_i2c_add(2, mop500_i2c2_devices_u8500_r3, + ARRAY_SIZE(mop500_i2c2_devices_u8500_r3)); } |