Efika: Configure additional regulators for HDMI output

[karo-tx-uboot.git] / board / efikamx / efikamx.c

diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
index b78bf6ccba17d05cec33b6a4a3f278a842965965..3d2cc1a7f137f6d70fee78d1b38bf20ee1ad5c36 100644 (file)
--- a/board/efikamx/efikamx.c
+++ b/board/efikamx/efikamx.c
@@ -226,7 +226,7 @@ static void power_init(void)
 
        /* Set core voltage to 1.1V */
        pmic_reg_read(p, REG_SW_0, &val);
-       val = (val & ~SWx_VOLT_MASK) | SWx_1_100V;
+       val = (val & ~SWx_VOLT_MASK) | SWx_1_200V;
        pmic_reg_write(p, REG_SW_0, val);
 
        /* Setup VCC (SW2) to 1.25 */
@@ -260,18 +260,23 @@ static void power_init(void)
                (SWMODE_AUTO_AUTO << SWMODE4_SHIFT);
        pmic_reg_write(p, REG_SW_5, val);
 
-       /* Set VDIG to 1.65V, VGEN3 to 1.8V, VCAM to 2.6V */
+       /* Set VDIG to 1.8V, VGEN3 to 1.8V, VCAM to 2.6V */
        pmic_reg_read(p, REG_SETTING_0, &val);
        val &= ~(VCAM_MASK | VGEN3_MASK | VDIG_MASK);
-       val |= VDIG_1_65 | VGEN3_1_8 | VCAM_2_6;
+       val |= VDIG_1_8 | VGEN3_1_8 | VCAM_2_6;
        pmic_reg_write(p, REG_SETTING_0, val);
 
        /* Set VVIDEO to 2.775V, VAUDIO to 3V, VSD to 3.15V */
        pmic_reg_read(p, REG_SETTING_1, &val);
        val &= ~(VVIDEO_MASK | VSD_MASK | VAUDIO_MASK);
-       val |= VSD_3_15 | VAUDIO_3_0 | VVIDEO_2_775;
+       val |= VSD_3_15 | VAUDIO_3_0 | VVIDEO_2_775 | VGEN1_1_2 | VGEN2_3_15;
        pmic_reg_write(p, REG_SETTING_1, val);
 
+       /* Enable VGEN1, VGEN2, VDIG, VPLL */
+       pmic_reg_read(p, REG_MODE_0, &val);
+       val |= VGEN1EN | VDIGEN | VGEN2EN | VPLLEN;
+       pmic_reg_write(p, REG_MODE_0, val);
+
        /* Configure VGEN3 and VCAM regulators to use external PNP */
        val = VGEN3CONFIG | VCAMCONFIG;
        pmic_reg_write(p, REG_MODE_1, val);
@@ -279,7 +284,7 @@ static void power_init(void)
 
        /* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */
        val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG |
-               VVIDEOEN | VAUDIOEN  | VSDEN;
+               VVIDEOEN | VAUDIOEN | VSDEN;
        pmic_reg_write(p, REG_MODE_1, val);
 
        pmic_reg_read(p, REG_POWER_CTL2, &val);