mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 09:04:39 +02:00
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: a6a494c8e3 ("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>
This commit is contained in:
parent
8f5ae30d69
commit
c24928ac69
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user