Re: [PATCH v2 2/3] power: supply: Add driver for Microchip UCS1002

From: Lucas Stach
Date: Mon Apr 29 2019 - 06:27:47 EST


Hi Andrey,

Am Sonntag, den 28.04.2019, 22:47 -0700 schrieb Andrey Smirnov:
> Add driver for Microchip UCS1002 Programmable USB Port Power
> Controller with Charger Emulation. The driver exposed a power supply
> device to control/monitor various parameter of the device as well as a
> regulator to allow controlling VBUS line.
>
> > Signed-off-by: Enric Balletbo Serra <enric.balletbo@xxxxxxxxxxxxx>
> > Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
> > Cc: Chris Healy <cphealy@xxxxxxxxx>
> > Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> > Cc: Fabio Estevam <fabio.estevam@xxxxxxx>
> > Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
> > Cc: Sebastian Reichel <sre@xxxxxxxxxx>
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: linux-pm@xxxxxxxxxxxxxxx
> ---
[...]
> + /* Enable charge rationing by default */
> > + ret = regmap_update_bits(info->regmap, UCS1002_REG_GENERAL_CFG,
> > + ÂF_RATION_EN, F_RATION_EN);
> > + if (ret) {
> > + dev_err(dev, "Failed to read general config: %d\n", ret);
> > + return ret;
> > + }
> +
> > + /*
> > + Â* Ignore the M1, M2, PWR_EN, and EM_EN pin states. Set active
> > + Â* mode selection to BC1.2 CDP.
> > + Â*/
> > + ret = regmap_update_bits(info->regmap, UCS1002_REG_SWITCH_CFG,
> > + ÂV_SET_ACTIVE_MODE_MASK,
> + ÂV_SET_ACTIVE_MODE_BC12_CDP);

This doesn't work as the F_PIN_IGNORE bit isn't set, so the the
external strap settings are applied. I had to apply the following diff
to make the driver behave as expected again:

--- a/drivers/power/supply/ucs1002_power.c
+++ b/drivers/power/supply/ucs1002_power.c
@@ -548,8 +548,8 @@ static int ucs1002_probe(struct i2c_client *client,
ÂÂÂÂÂÂÂÂÂ* mode selection to BC1.2 CDP.
ÂÂÂÂÂÂÂÂÂ*/
ÂÂÂÂÂÂÂÂret = regmap_update_bits(info->regmap, UCS1002_REG_SWITCH_CFG,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂV_SET_ACTIVE_MODE_MASK,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂV_SET_ACTIVE_MODE_BC12_CDP);
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂV_SET_ACTIVE_MODE_MASK | F_PIN_IGNORE,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂV_SET_ACTIVE_MODE_BC12_CDP | F_PIN_IGNORE);

Regards,
Lucas