Hi,
On Mon, Jun 17, 2024 at 01:55:54PM GMT, Heikki Krogerus wrote:
> UCSI has this information in the Battery Charging Capability
> Status, so making it available for the user.
>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
-- Sebastian
> drivers/usb/typec/ucsi/psy.c | 27 +++++++++++++++++++++++++++
> drivers/usb/typec/ucsi/ucsi.c | 3 +++
> 2 files changed, 30 insertions(+)
>
> diff --git a/drivers/usb/typec/ucsi/psy.c b/drivers/usb/typec/ucsi/psy.c
> index b35c6e07911e..b3910f37e171 100644
> --- a/drivers/usb/typec/ucsi/psy.c
> +++ b/drivers/usb/typec/ucsi/psy.c
> @@ -20,6 +20,7 @@ enum ucsi_psy_online_states {
> };
>
> static enum power_supply_property ucsi_psy_props[] = {
> + POWER_SUPPLY_PROP_CHARGE_TYPE,
> POWER_SUPPLY_PROP_USB_TYPE,
> POWER_SUPPLY_PROP_ONLINE,
> POWER_SUPPLY_PROP_VOLTAGE_MIN,
> @@ -194,6 +195,30 @@ static int ucsi_psy_get_usb_type(struct ucsi_connector *con,
> return 0;
> }
>
> +static int ucsi_psy_get_charge_type(struct ucsi_connector *con, union power_supply_propval *val)
> +{
> + if (!(con->status.flags & UCSI_CONSTAT_CONNECTED) ||
> + (con->status.flags & UCSI_CONSTAT_PWR_DIR) != TYPEC_SINK) {
> + val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE;
> + return 0;
> + }
> +
> + switch (UCSI_CONSTAT_BC_STATUS(con->status.pwr_status)) {
> + case UCSI_CONSTAT_BC_NOMINAL_CHARGING:
> + val->intval = POWER_SUPPLY_CHARGE_TYPE_STANDARD;
> + break;
> + case UCSI_CONSTAT_BC_SLOW_CHARGING:
> + case UCSI_CONSTAT_BC_TRICKLE_CHARGING:
> + val->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
> + break;
> + default:
> + val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE;
> + break;
> + }
> +
> + return 0;
> +}
> +
> static int ucsi_psy_get_prop(struct power_supply *psy,
> enum power_supply_property psp,
> union power_supply_propval *val)
> @@ -201,6 +226,8 @@ static int ucsi_psy_get_prop(struct power_supply *psy,
> struct ucsi_connector *con = power_supply_get_drvdata(psy);
>
> switch (psp) {
> + case POWER_SUPPLY_PROP_CHARGE_TYPE:
> + return ucsi_psy_get_charge_type(con, val);
> case POWER_SUPPLY_PROP_USB_TYPE:
> return ucsi_psy_get_usb_type(con, val);
> case POWER_SUPPLY_PROP_ONLINE:
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index 6bbaad4b89a5..51135e3502cf 100644
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -1257,6 +1257,9 @@ static void ucsi_handle_connector_change(struct work_struct *work)
> if (con->status.change & UCSI_CONSTAT_CAM_CHANGE)
> ucsi_partner_task(con, ucsi_check_altmodes, 1, HZ);
>
> + if (con->status.change & UCSI_CONSTAT_BC_CHANGE)
> + ucsi_port_psy_changed(con);
> +
> out_unlock:
> mutex_unlock(&con->lock);
> }
> --
> 2.43.0
>
Attachment:
signature.asc
Description: PGP signature
