diff options
| author | Bibek Basu <bbasu@nvidia.com> | 2013-06-17 09:06:06 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:27:33 -0700 |
| commit | e0b15c137baa02fc286de96ee3292b7ebc1f6590 (patch) | |
| tree | 9188add149691057b6e675080cd78c7dc7c9a40a /arch/arm/mach-tegra/panel-a-1080p-14-0.c | |
| parent | b1fa52e88d9c517ad11aad6e59d8276dade88e69 (diff) | |
ARM: tegra: Update Laguna power tree
Update laguna Power tree to accomodate
further supplies & adher to coding guidelines
Bug 1275005
Change-Id: I3a5964d9f50a26fa32f72f11ffc55ff657edf32a
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/239178
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/panel-a-1080p-14-0.c')
| -rw-r--r-- | arch/arm/mach-tegra/panel-a-1080p-14-0.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/panel-a-1080p-14-0.c b/arch/arm/mach-tegra/panel-a-1080p-14-0.c index b2fd93781d29..cf317219bb9d 100644 --- a/arch/arm/mach-tegra/panel-a-1080p-14-0.c +++ b/arch/arm/mach-tegra/panel-a-1080p-14-0.c @@ -40,7 +40,7 @@ static bool reg_requested; static bool gpio_requested; static struct platform_device *disp_device; static struct regulator *avdd_lcd_3v3; -static struct regulator *vdd_lcd_bl; +static struct regulator *vdd_1v2_en; static struct regulator *vdd_lcd_bl_en; static struct regulator *dvdd_lcd_1v8; static struct regulator *vdd_ds_1v8; @@ -143,11 +143,11 @@ static int laguna_dsi_regulator_get(struct device *dev) goto fail; } - vdd_lcd_bl = regulator_get(dev, "vdd_lcd_bl"); - if (IS_ERR_OR_NULL(vdd_lcd_bl)) { - pr_err("vdd_lcd_bl regulator get failed\n"); - err = PTR_ERR(vdd_lcd_bl); - vdd_lcd_bl = NULL; + vdd_1v2_en = regulator_get(dev, "vdd_1v2_en"); + if (IS_ERR_OR_NULL(vdd_1v2_en)) { + pr_err("vdd_1v2_en regulator get failed\n"); + err = PTR_ERR(vdd_1v2_en); + vdd_1v2_en = NULL; goto fail; } @@ -260,10 +260,10 @@ static int dsi_a_1080p_14_0_enable(struct device *dev) } } - if (vdd_lcd_bl) { - err = regulator_enable(vdd_lcd_bl); + if (vdd_1v2_en) { + err = regulator_enable(vdd_1v2_en); if (err < 0) { - pr_err("vdd_lcd_bl regulator enable failed\n"); + pr_err("vdd_1v2_en regulator enable failed\n"); goto fail; } } @@ -295,8 +295,8 @@ static int dsi_a_1080p_14_0_disable(void) gpio_set_value(refclk_en, 0); gpio_set_value(en_vdd_bl, 0); - if (vdd_lcd_bl) - regulator_disable(vdd_lcd_bl); + if (vdd_1v2_en) + regulator_disable(vdd_1v2_en); if (vdd_lcd_bl_en) regulator_disable(vdd_lcd_bl_en); |