usb: typec: ucsi: psy: Add power supply status

Add support for power supply status. If a port is acting as a sink
with the sink path enabled, report it is charging. If a port is
source, report it is discharging. If there is no connection or the
port hasn't enabled the sink path, report not charging.

Signed-off-by: Jameson Thies <jthies@google.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Tested-By: Kenneth R. Crudup <kenny@panix.com>
Link: https://patch.msgid.link/20251016235909.2092917-2-jthies@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/psy.c b/drivers/usb/typec/ucsi/psy.c
index 62a9d68bb66d21bc805035c29db9b30936d5c802..2b022582150201bb2a25e63c1adc39fa7efd3e16 100644 (file)
--- a/drivers/usb/typec/ucsi/psy.c
+++ b/drivers/usb/typec/ucsi/psy.c
@@ -29,6 +29,7 @@ static enum power_supply_property ucsi_psy_props[] = {
        POWER_SUPPLY_PROP_CURRENT_MAX,
        POWER_SUPPLY_PROP_CURRENT_NOW,
        POWER_SUPPLY_PROP_SCOPE,
+       POWER_SUPPLY_PROP_STATUS,
 };
 
 static int ucsi_psy_get_scope(struct ucsi_connector *con,
@@ -51,6 +52,29 @@ static int ucsi_psy_get_scope(struct ucsi_connector *con,
        return 0;
 }
 
+static int ucsi_psy_get_status(struct ucsi_connector *con,
+                              union power_supply_propval *val)
+{
+       bool is_sink = UCSI_CONSTAT(con, PWR_DIR) == TYPEC_SINK;
+       bool sink_path_enabled = true;
+
+       val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+
+       if (con->ucsi->version >= UCSI_VERSION_2_0)
+               sink_path_enabled =
+                       UCSI_CONSTAT(con, SINK_PATH_STATUS_V2_0) ==
+                       UCSI_CONSTAT_SINK_PATH_ENABLED;
+
+       if (UCSI_CONSTAT(con, CONNECTED)) {
+               if (is_sink && sink_path_enabled)
+                       val->intval = POWER_SUPPLY_STATUS_CHARGING;
+               else if (!is_sink)
+                       val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+       }
+
+       return 0;
+}
+
 static int ucsi_psy_get_online(struct ucsi_connector *con,
                               union power_supply_propval *val)
 {
@@ -245,6 +269,8 @@ static int ucsi_psy_get_prop(struct power_supply *psy,
                return ucsi_psy_get_current_now(con, val);
        case POWER_SUPPLY_PROP_SCOPE:
                return ucsi_psy_get_scope(con, val);
+       case POWER_SUPPLY_PROP_STATUS:
+               return ucsi_psy_get_status(con, val);
        default:
                return -EINVAL;
        }

diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index e301d9012936fb85eaff7f260a862ff099eb77c5..cce93af7461b9f806b9e67704642ee25cc901183 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -360,6 +360,9 @@ struct ucsi_cable_property {
 #define   UCSI_CONSTAT_BC_SLOW_CHARGING                2
 #define   UCSI_CONSTAT_BC_TRICKLE_CHARGING     3
 #define UCSI_CONSTAT_PD_VERSION_V1_2           UCSI_DECLARE_BITFIELD_V1_2(70, 16)
+#define UCSI_CONSTAT_SINK_PATH_STATUS_V2_0     UCSI_DECLARE_BITFIELD_V2_0(87, 1)
+#define   UCSI_CONSTAT_SINK_PATH_DISABLED   0
+#define   UCSI_CONSTAT_SINK_PATH_ENABLED    1
 #define UCSI_CONSTAT_PWR_READING_READY_V2_1    UCSI_DECLARE_BITFIELD_V2_1(89, 1)
 #define UCSI_CONSTAT_CURRENT_SCALE_V2_1                UCSI_DECLARE_BITFIELD_V2_1(90, 3)
 #define UCSI_CONSTAT_PEAK_CURRENT_V2_1         UCSI_DECLARE_BITFIELD_V2_1(93, 16)