Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Display: remove the unused regulator "reg_ext_3p3v"

Browse source 
Change-Id: I348126a74c30bebb5f0a8414098f5a19e53ab87b
Reviewed-on: http://mcrd1-5.corpnet.asus/code-review/master/68073
Reviewed-by: Hou-Hsun Lee <Hou-Hsun_Lee@asus.com>
Tested-by: Hou-Hsun Lee <Hou-Hsun_Lee@asus.com>
Reviewed-by: Yetta Wu <Yetta_Wu@asus.com>
Reviewed-by: Warlock Tai <warlock_tai@asus.com>
This commit is contained in:
Hou-Hsun_Lee 2013-01-31 09:47:37 +08:00 committed by Iliyan Malchev
parent f18d905b41
commit 6e6066cca0
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/mach-msm/asustek/flo/board-flo-display.c
View file

@ -829,13 +829,13 @@ static int hdmi_enable_5v(int on)
static int hdmi_core_power(int on, int show)
{
static struct regulator *reg_8921_lvs7, *reg_8921_s4, *reg_ext_3p3v;
static struct regulator *reg_8921_lvs7, *reg_8921_s4;
static int prev_on;
int rc;
if (on == prev_on)
return 0;
#if 0
/* TBD: PM8921 regulator instead of 8901 */
if (!reg_ext_3p3v) {
reg_ext_3p3v = regulator_get(&hdmi_msm_device.dev,
@ -847,7 +847,7 @@ static int hdmi_core_power(int on, int show)
return -ENODEV;
}
}
#endif
if (!reg_8921_lvs7) {
reg_8921_lvs7 = regulator_get(&hdmi_msm_device.dev,
"hdmi_vdda");
@ -875,6 +875,7 @@ static int hdmi_core_power(int on, int show)
}
if (on) {
#if 0
/*
* Configure 3P3V_BOOST_EN as GPIO, 8mA drive strength,
* pull none, out-high
@ -890,6 +891,7 @@ static int hdmi_core_power(int on, int show)
pr_err("enable reg_ext_3p3v failed, rc=%d\n", rc);
return rc;
}
#endif
rc = regulator_enable(reg_8921_lvs7);
if (rc) {
pr_err("'%s' regulator enable failed, rc=%d\n",
@ -904,11 +906,13 @@ static int hdmi_core_power(int on, int show)
}
pr_debug("%s(on): success\n", __func__);
} else {
#if 0
rc = regulator_disable(reg_ext_3p3v);
if (rc) {
pr_err("disable reg_ext_3p3v failed, rc=%d\n", rc);
return -ENODEV;
}
#endif
rc = regulator_disable(reg_8921_lvs7);
if (rc) {
pr_err("disable reg_8921_l23 failed, rc=%d\n", rc);
@ -929,7 +933,7 @@ static int hdmi_core_power(int on, int show)
error2:
regulator_disable(reg_8921_lvs7);
error1:
regulator_disable(reg_ext_3p3v);
// regulator_disable(reg_ext_3p3v);
return rc;
}