| Message ID | 20210423150057.97e0a2b43f20fdc3513f4fea@uvos.xyz |
|---|---|
| State | Accepted |
| Commit | eab4e6d953c1059a30ac0f15826abc7dd2374d3c |
| Headers | show |
| Series | [v2] power: supply: cpcap-charger: get the battery inserted infomation from cpcap-battery | expand |
Hi, On Fri, Apr 23, 2021 at 03:00:57PM +0200, Carl Philipp Klemm wrote: > This avoids reimplementing the detection logic twice and removes the > possibility of activating charging with 500mA even if a battery is not > detected. > > Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz> > --- Thanks, queued. -- Sebastian > drivers/power/supply/cpcap-charger.c | 39 ++++++++++++++-------------- > 1 file changed, 20 insertions(+), 19 deletions(-) > > diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c > index 641dcad1133f..a5983365b81a 100644 > --- a/drivers/power/supply/cpcap-charger.c > +++ b/drivers/power/supply/cpcap-charger.c > @@ -173,23 +173,6 @@ static enum power_supply_property cpcap_charger_props[] = { > POWER_SUPPLY_PROP_CURRENT_NOW, > }; > > -/* No battery always shows temperature of -40000 */ > -static bool cpcap_charger_battery_found(struct cpcap_charger_ddata *ddata) > -{ > - struct iio_channel *channel; > - int error, temperature; > - > - channel = ddata->channels[CPCAP_CHARGER_IIO_BATTDET]; > - error = iio_read_channel_processed(channel, &temperature); > - if (error < 0) { > - dev_warn(ddata->dev, "%s failed: %i\n", __func__, error); > - > - return false; > - } > - > - return temperature > -20000 && temperature < 60000; > -} > - > static int cpcap_charger_get_charge_voltage(struct cpcap_charger_ddata *ddata) > { > struct iio_channel *channel; > @@ -697,11 +680,29 @@ static void cpcap_usb_detect(struct work_struct *work) > > if (!ddata->feeding_vbus && cpcap_charger_vbus_valid(ddata) && > s.chrgcurr1) { > - int max_current = 532000; > + int max_current; > int vchrg, ichrg; > + union power_supply_propval val; > + struct power_supply *battery; > > - if (cpcap_charger_battery_found(ddata)) > + battery = power_supply_get_by_name("battery"); > + if (IS_ERR_OR_NULL(battery)) { > + dev_err(ddata->dev, "battery power_supply not available %li\n", > + PTR_ERR(battery)); > + return; > + } > + > + error = power_supply_get_property(battery, POWER_SUPPLY_PROP_PRESENT, &val); > + power_supply_put(battery); > + if (error) > + goto out_err; > + > + if (val.intval) { > max_current = 1596000; > + } else { > + dev_info(ddata->dev, "battery not inserted charging disabled\n"); > + max_current = 0; > + } > > if (max_current > ddata->limit_current) > max_current = ddata->limit_current; > -- > 2.31.0 > >
diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c index 641dcad1133f..a5983365b81a 100644 --- a/drivers/power/supply/cpcap-charger.c +++ b/drivers/power/supply/cpcap-charger.c @@ -173,23 +173,6 @@ static enum power_supply_property cpcap_charger_props[] = { POWER_SUPPLY_PROP_CURRENT_NOW, }; -/* No battery always shows temperature of -40000 */ -static bool cpcap_charger_battery_found(struct cpcap_charger_ddata *ddata) -{ - struct iio_channel *channel; - int error, temperature; - - channel = ddata->channels[CPCAP_CHARGER_IIO_BATTDET]; - error = iio_read_channel_processed(channel, &temperature); - if (error < 0) { - dev_warn(ddata->dev, "%s failed: %i\n", __func__, error); - - return false; - } - - return temperature > -20000 && temperature < 60000; -} - static int cpcap_charger_get_charge_voltage(struct cpcap_charger_ddata *ddata) { struct iio_channel *channel; @@ -697,11 +680,29 @@ static void cpcap_usb_detect(struct work_struct *work) if (!ddata->feeding_vbus && cpcap_charger_vbus_valid(ddata) && s.chrgcurr1) { - int max_current = 532000; + int max_current; int vchrg, ichrg; + union power_supply_propval val; + struct power_supply *battery; - if (cpcap_charger_battery_found(ddata)) + battery = power_supply_get_by_name("battery"); + if (IS_ERR_OR_NULL(battery)) { + dev_err(ddata->dev, "battery power_supply not available %li\n", + PTR_ERR(battery)); + return; + } + + error = power_supply_get_property(battery, POWER_SUPPLY_PROP_PRESENT, &val); + power_supply_put(battery); + if (error) + goto out_err; + + if (val.intval) { max_current = 1596000; + } else { + dev_info(ddata->dev, "battery not inserted charging disabled\n"); + max_current = 0; + } if (max_current > ddata->limit_current) max_current = ddata->limit_current;
This avoids reimplementing the detection logic twice and removes the possibility of activating charging with 500mA even if a battery is not detected. Signed-off-by: Carl Philipp Klemm <philipp@uvos.xyz> --- drivers/power/supply/cpcap-charger.c | 39 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-)