ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally

[pandora-kernel.git] / arch / arm / mach-omap2 / board-igep0020.c

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 930c0d3..8f67861 100644 (file)
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/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);