Skip to content

Commit c24928a

Browse files
Dzmitry Sankouskisre
authored andcommitted
mfd: max77705: max77705_charger: move active discharge setting to mfd parent
Active discharge setting is a part of MFD top level i2c device, hence cannot be controlled by charger. Writing to MAX77705_PMIC_REG_MAINCTRL1 register from charger driver is a mistake. Move active discharge setting to MFD parent driver. Fixes: a6a494c ("power: supply: max77705: Add charger driver for Maxim 77705") Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Acked-by: Lee Jones <lee@kernel.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 8f5ae30 commit c24928a

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/mfd/max77705.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ static int max77705_i2c_probe(struct i2c_client *i2c)
108108
if (pmic_rev != MAX77705_PASS3)
109109
return dev_err_probe(dev, -ENODEV, "Rev.0x%x is not tested\n", pmic_rev);
110110

111+
/* Active Discharge Enable */
112+
regmap_update_bits(max77705->regmap, MAX77705_PMIC_REG_MAINCTRL1, 1, 1);
113+
111114
ret = devm_regmap_add_irq_chip(dev, max77705->regmap,
112115
i2c->irq,
113116
IRQF_ONESHOT | IRQF_SHARED, 0,

drivers/power/supply/max77705_charger.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,6 @@ static void max77705_charger_initialize(struct max77705_charger_data *chg)
487487
regmap_update_bits(regmap, MAX77705_CHG_REG_CNFG_00,
488488
MAX77705_WDTEN_MASK, 0);
489489

490-
/* Active Discharge Enable */
491-
regmap_update_bits(regmap, MAX77705_PMIC_REG_MAINCTRL1, 1, 1);
492-
493490
/* VBYPSET=5.0V */
494491
regmap_update_bits(regmap, MAX77705_CHG_REG_CNFG_11, MAX77705_VBYPSET_MASK, 0);
495492

0 commit comments

Comments
 (0)