Patch "power: supply: bq24190: Fix BQ24296 Vbus regulator support" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    power: supply: bq24190: Fix BQ24296 Vbus regulator support

to the 6.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     power-supply-bq24190-fix-bq24296-vbus-regulator-supp.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 04595c7901859ddc28a0853a3c89a4dd1181ea11
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Sat Nov 16 21:36:47 2024 +0100

    power: supply: bq24190: Fix BQ24296 Vbus regulator support
    
    [ Upstream commit b3ded6072c5600704cfa3ce3a8dc8718d34bda66 ]
    
    There are 2 issues with bq24296_set_otg_vbus():
    
    1. When writing the OTG_CONFIG bit it uses POC_CHG_CONFIG_SHIFT which
       should be POC_OTG_CONFIG_SHIFT.
    
    2. When turning the regulator off it never turns charging back on. Note
       this must be done through bq24190_charger_set_charge_type(), to ensure
       that the charge_type property value of none/trickle/fast is honored.
    
    Resolve both issues to fix BQ24296 Vbus regulator support not working.
    
    Fixes: b150a703b56f ("power: supply: bq24190_charger: Add support for BQ24296")
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20241116203648.169100-2-hdegoede@xxxxxxxxxx
    Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c
index 2b393eb5c282..c47f32f152e6 100644
--- a/drivers/power/supply/bq24190_charger.c
+++ b/drivers/power/supply/bq24190_charger.c
@@ -567,6 +567,7 @@ static int bq24190_set_otg_vbus(struct bq24190_dev_info *bdi, bool enable)
 
 static int bq24296_set_otg_vbus(struct bq24190_dev_info *bdi, bool enable)
 {
+	union power_supply_propval val = { .intval = bdi->charge_type };
 	int ret;
 
 	ret = pm_runtime_resume_and_get(bdi->dev);
@@ -587,13 +588,18 @@ static int bq24296_set_otg_vbus(struct bq24190_dev_info *bdi, bool enable)
 
 		ret = bq24190_write_mask(bdi, BQ24190_REG_POC,
 					 BQ24296_REG_POC_OTG_CONFIG_MASK,
-					 BQ24296_REG_POC_CHG_CONFIG_SHIFT,
+					 BQ24296_REG_POC_OTG_CONFIG_SHIFT,
 					 BQ24296_REG_POC_OTG_CONFIG_OTG);
-	} else
+	} else {
 		ret = bq24190_write_mask(bdi, BQ24190_REG_POC,
 					 BQ24296_REG_POC_OTG_CONFIG_MASK,
-					 BQ24296_REG_POC_CHG_CONFIG_SHIFT,
+					 BQ24296_REG_POC_OTG_CONFIG_SHIFT,
 					 BQ24296_REG_POC_OTG_CONFIG_DISABLE);
+		if (ret < 0)
+			goto out;
+
+		ret = bq24190_charger_set_charge_type(bdi, &val);
+	}
 
 out:
 	pm_runtime_mark_last_busy(bdi->dev);