commit 0bc189f5529647611cdd7db82386327147dfe576
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 25 14:51:13 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 25 14:51:13 2013 -0700
tree 29d16cf7583557b3acc0f4e0e8e56ff5dd57175d
parent 8b4feb9c0b780a4cd9afb5866810939d7c26e9de
parent b5fb99cd5495204ef65b19029e9ab69082c56a2d

Merge "target: msm8610: Do not configure LDO4"

target/msm8610/target_display.c

diff --git a/target/msm8610/target_display.c b/target/msm8610/target_display.c
index 4904848..6316fa8 100644
--- a/target/msm8610/target_display.c
+++ b/target/msm8610/target_display.c
@@ -136,7 +136,6 @@
 static int msm8610_mipi_panel_power(uint8_t enable)
 {
 	int ret;
-	struct pm8x41_ldo ldo4 = LDO(PM8x41_LDO4, NLDO_TYPE);
 	struct pm8x41_ldo ldo14 = LDO(PM8x41_LDO14, PLDO_TYPE);
 	struct pm8x41_ldo ldo19 = LDO(PM8x41_LDO19, PLDO_TYPE);
 
@@ -151,8 +150,6 @@
 		pm8x41_ldo_control(&ldo14, enable);
 		pm8x41_ldo_set_voltage(&ldo19, 2850000);
 		pm8x41_ldo_control(&ldo19, enable);
-		pm8x41_ldo_set_voltage(&ldo4, 1200000);
-		pm8x41_ldo_control(&ldo4, enable);
 
 		/* reset */
 		msm8610_mdss_mipi_panel_reset(enable);
@@ -162,7 +159,6 @@
 
 		pm8x41_ldo_control(&ldo19, enable);
 		pm8x41_ldo_control(&ldo14, enable);
-		pm8x41_ldo_control(&ldo4, enable);
 	}
 	return 0;
 }