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: a6a494c8e3ce ("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>

diff --git a/drivers/mfd/max77705.c b/drivers/mfd/max77705.c
index 6b263bacb8c28d980e890777452db58be84d7338..ff07d0e0d5f8ee2c2b4bdb0953c0dd09c6d96c6a 100644 (file)
--- a/drivers/mfd/max77705.c
+++ b/drivers/mfd/max77705.c
@@ -108,6 +108,9 @@ static int max77705_i2c_probe(struct i2c_client *i2c)
        if (pmic_rev != MAX77705_PASS3)
                return dev_err_probe(dev, -ENODEV, "Rev.0x%x is not tested\n", pmic_rev);
 
+       /* Active Discharge Enable */
+       regmap_update_bits(max77705->regmap, MAX77705_PMIC_REG_MAINCTRL1, 1, 1);
+
        ret = devm_regmap_add_irq_chip(dev, max77705->regmap,
                                        i2c->irq,
                                        IRQF_ONESHOT | IRQF_SHARED, 0,

diff --git a/drivers/power/supply/max77705_charger.c b/drivers/power/supply/max77705_charger.c
index 329b430d0e50658dc0c210dadca2e8397a7f6507..3b75c82b9b9ead3472198efb1b7de01185ffe360 100644 (file)
--- a/drivers/power/supply/max77705_charger.c
+++ b/drivers/power/supply/max77705_charger.c
@@ -487,9 +487,6 @@ static void max77705_charger_initialize(struct max77705_charger_data *chg)
        regmap_update_bits(regmap, MAX77705_CHG_REG_CNFG_00,
                                MAX77705_WDTEN_MASK, 0);
 
-       /* Active Discharge Enable */
-       regmap_update_bits(regmap, MAX77705_PMIC_REG_MAINCTRL1, 1, 1);
-
        /* VBYPSET=5.0V */
        regmap_update_bits(regmap, MAX77705_CHG_REG_CNFG_11, MAX77705_VBYPSET_MASK, 0);