From baf269387abcbfbae6d0c68a51f3ee86a4e61923 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 9 May 2012 08:10:42 -0700
Subject: [PATCH] --- yaml --- r: 303151 b: refs/heads/master c:
 b2f44dc29bfab77b10f3a709f14677f51ce3a4cd h: refs/heads/master i:   303149:
 ee3a604ce41508755ecc8d602287e86b697d5769   303147:
 1f5c746eb637e3788041a34cfde94e9a5f2225a3   303143:
 12b25edb04d34a2c9bf8f93388332e69b54e7f7e   303135:
 359d48a7886cc1971e8558279af4c96a22b77345 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/arm/mach-omap2/board-igep0020.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b1a0c4b05721..6663d85abf20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d09a957cb92725ddde3f70dd1e4d12281e33a25
+refs/heads/master: b2f44dc29bfab77b10f3a709f14677f51ce3a4cd
diff --git a/trunk/arch/arm/mach-omap2/board-igep0020.c b/trunk/arch/arm/mach-omap2/board-igep0020.c
index 930c0d380435..8f67861405bc 100644
--- a/trunk/arch/arm/mach-omap2/board-igep0020.c
+++ b/trunk/arch/arm/mach-omap2/board-igep0020.c
@@ -540,7 +540,10 @@ static void __init igep_i2c_init(void)
 {
 	int ret;
 
-	omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_USB, 0);
+	omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_USB,
+			      TWL_COMMON_REGULATOR_VPLL2);
+	igep_twldata.vpll2->constraints.apply_uV = true;
+	igep_twldata.vpll2->constraints.name = "VDVI";
 
 	if (machine_is_igep0020()) {
 		/*
@@ -554,10 +557,7 @@ static void __init igep_i2c_init(void)
 
 		igep_twldata.keypad	= &igep2_keypad_pdata;
 		/* Get common pmic data */
-		omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_AUDIO,
-				      TWL_COMMON_REGULATOR_VPLL2);
-		igep_twldata.vpll2->constraints.apply_uV = true;
-		igep_twldata.vpll2->constraints.name = "VDVI";
+		omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_AUDIO, 0);
 	}
 
 	omap3_pmic_init("twl4030", &igep_twldata);