Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas

Conflicts:
	drivers/regulator/palmas-regulator.c

diff --cc drivers/regulator/palmas-regulator.c
index 8fa651e998dac1a21d0cbbe0ae954febb48cb488,327788892cc944dbb6b768685558d20ff6a60298..7c8b4417d7d882b8a3437cd789c3d56fb6be6a58
--- 1/drivers/regulator/palmas-regulator.c
--- 2/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@@ -465,7 -322,11 +465,11 @@@ static int palmas_set_mode_smps(struct 
        pmic->current_reg_mode[id] = reg & PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
        if (rail_enable)
                palmas_smps_write(pmic->palmas,
 -                      palmas_regs_info[id].ctrl_addr, reg);
 +                                ddata->palmas_regs_info[id].ctrl_addr, reg);
+ 
+       /* Switch the enable value to ensure this is used for enable */
+       pmic->desc[id].enable_val = pmic->current_reg_mode[id];
+ 
        return 0;
  }