Merge remote-tracking branch 'regulator/fix/tps65910' into regulator-linus

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index fb991ec76423..696116ebdf50 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -1111,6 +1111,12 @@ static int tps65910_probe(struct platform_device *pdev)
                 pmic->num_regulators = ARRAY_SIZE(tps65910_regs);
                 pmic->ext_sleep_control = tps65910_ext_sleep_control;
                 info = tps65910_regs;
+                /* Work around silicon erratum SWCZ010: output programmed
+                 * voltage level can go higher than expected or crash
+                 * Workaround: use no synchronization of DCDC clocks
+                 */
+                tps65910_reg_clear_bits(pmic->mfd, TPS65910_DCDCCTRL,
+                                        DCDCCTRL_DCDCCKSYNC_MASK);
                 break;
         case TPS65911:
                 pmic->get_ctrl_reg = &tps65911_get_ctrl_register;