Merge git://git.denx.de/u-boot-mmc

[oweals/u-boot.git] / drivers / power / pmic / pmic_tps65218.c

diff --git a/drivers/power/pmic/pmic_tps65218.c b/drivers/power/pmic/pmic_tps65218.c
index 0fd0ad478a2bc2bbb100a5cd8a4b7db3d08099d9..911f63942d3855dacd1f1b0a662a63559273456a 100644 (file)
--- a/drivers/power/pmic/pmic_tps65218.c
+++ b/drivers/power/pmic/pmic_tps65218.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <i2c.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
 
@@ -96,12 +96,13 @@ int tps65218_reg_write(uchar prot_level, uchar dest_reg, uchar dest_val,
 int tps65218_voltage_update(uchar dc_cntrl_reg, uchar volt_sel)
 {
        if ((dc_cntrl_reg != TPS65218_DCDC1) &&
-           (dc_cntrl_reg != TPS65218_DCDC2))
+           (dc_cntrl_reg != TPS65218_DCDC2) &&
+           (dc_cntrl_reg != TPS65218_DCDC3))
                return 1;
 
        /* set voltage level */
        if (tps65218_reg_write(TPS65218_PROT_LEVEL_2, dc_cntrl_reg, volt_sel,
-                              TPS65218_MASK_ALL_BITS))
+                              TPS65218_DCDC_VSEL_MASK))
                return 1;
 
        /* set GO bit to initiate voltage transition */