Commit cf9836f4ddd1a08e88fe05e06f21313c609d3d55

Authored by Juha Keski-Saari
Committed by Liam Girdwood
1 parent 53b8a9d92a

twl-regulator: Fix reg_disable functionality for 4030 and 6030

This change makes sure all regulator group assignments are cleared on
disable call

Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/regulator/twl-regulator.c
... ... @@ -163,9 +163,9 @@
163 163 return grp;
164 164  
165 165 if (twl_class_is_4030())
166   - grp &= ~P1_GRP_4030;
  166 + grp &= ~(P1_GRP_4030 | P2_GRP_4030 | P3_GRP_4030);
167 167 else
168   - grp &= ~P1_GRP_6030;
  168 + grp &= ~(P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030);
169 169  
170 170 return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp);
171 171 }