diff options
| author | Erik Lilliebjerg <elilliebjerg@nvidia.com> | 2011-12-01 05:58:00 -0700 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-08 18:04:52 +0530 |
| commit | dc9bebb57ba7f7029beec44cb88beeb28ac0a57d (patch) | |
| tree | 80854ad211bcb882c13c947a17aa6280f4859ac5 /arch/arm/mach-tegra/board-enterprise-sensors.c | |
| parent | fb24a74f356b1bb97e9bf81ce694d0d9191e49ed (diff) | |
arm: tegra: enterprise: TPS61050 board support
Bug 860351
Bug 850614
Bug 852480
Bug 872156
Bug 824459
Change-Id: Ied7c156bf61024965592a792439699bf0226fe60
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-on: http://git-master/r/66167
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise-sensors.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-sensors.c | 62 |
1 files changed, 7 insertions, 55 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-sensors.c b/arch/arm/mach-tegra/board-enterprise-sensors.c index 7d71d1b1e228..b7b10109286c 100644 --- a/arch/arm/mach-tegra/board-enterprise-sensors.c +++ b/arch/arm/mach-tegra/board-enterprise-sensors.c @@ -436,50 +436,15 @@ struct ov9726_platform_data enterprise_ov9726_data = { .pwdn_low_active = false, }; -static struct tps61050_pin_state enterprise_tps61050_pinstate = { +static struct nvc_torch_pin_state enterprise_tps61050_pinstate = { .mask = 0x0008, /*VGP3*/ .values = 0x0008, }; -/* I2C bus becomes active when vdd_1v8_cam is enabled */ -static int enterprise_tps61050_pm(int pwr) -{ - static struct regulator *enterprise_flash_reg = NULL; - int ret = 0; - - pr_info("%s: ++%d\n", __func__, pwr); - switch (pwr) { - case TPS61050_PWR_OFF: - if (enterprise_flash_reg) - regulator_disable(enterprise_flash_reg); - break; - case TPS61050_PWR_STDBY: - case TPS61050_PWR_COMM: - case TPS61050_PWR_ON: - if (!enterprise_flash_reg) { - enterprise_flash_reg = regulator_get(NULL, "vdd_1v8_cam"); - if (IS_ERR_OR_NULL(enterprise_flash_reg)) { - pr_err("%s: failed to get flash pwr\n", __func__); - return PTR_ERR(enterprise_flash_reg); - } - } - ret = regulator_enable(enterprise_flash_reg); - if (ret) { - pr_err("%s: failed to enable flash pwr\n", __func__); - goto fail_regulator_flash_reg; - } - enterprise_msleep(1); - break; - default: - ret = -1; - } - return ret; - -fail_regulator_flash_reg: - regulator_put(enterprise_flash_reg); - enterprise_flash_reg = NULL; - return ret; -} +static struct tps61050_platform_data enterprise_tps61050_pdata = { + .dev_name = "torch", + .pinstate = &enterprise_tps61050_pinstate, +}; struct enterprise_cam_gpio { @@ -529,19 +494,6 @@ static struct ar0832_platform_data enterprise_ar0832_le_data = { .id = "left", }; -static struct tps61050_platform_data enterprise_tps61050_data = { - .cfg = 0, - .num = 1, - .max_amp_torch = CAM_FLASH_MAX_TORCH_AMP, - .max_amp_flash = CAM_FLASH_MAX_FLASH_AMP, - .pinstate = &enterprise_tps61050_pinstate, - .init = NULL, - .exit = NULL, - .pm = &enterprise_tps61050_pm, - .gpio_envm = NULL, - .gpio_sync = NULL, -}; - static const struct i2c_board_info enterprise_i2c2_boardinfo[] = { { I2C_BOARD_INFO("pca9546", 0x70), @@ -549,7 +501,7 @@ static const struct i2c_board_info enterprise_i2c2_boardinfo[] = { }, { I2C_BOARD_INFO("tps61050", 0x33), - .platform_data = &enterprise_tps61050_data, + .platform_data = &enterprise_tps61050_pdata, }, { I2C_BOARD_INFO("ov9726", OV9726_I2C_ADDR >> 1), @@ -576,7 +528,7 @@ static struct i2c_board_info ar0832_i2c2_boardinfo[] = { }, { I2C_BOARD_INFO("tps61050", 0x33), - .platform_data = &enterprise_tps61050_data, + .platform_data = &enterprise_tps61050_pdata, }, { I2C_BOARD_INFO("ov9726", OV9726_I2C_ADDR >> 1), |