From: Jameson Thies <jthies@google.com>
To: heikki.krogerus@linux.intel.com, linux-usb@vger.kernel.org
Cc: jthies@google.com, bleung@google.com,
abhishekpandit@chromium.org, andersson@kernel.org,
dmitry.baryshkov@linaro.org, fabrice.gasnier@foss.st.com,
gregkh@linuxfoundation.org, hdegoede@redhat.com,
neil.armstrong@linaro.org, rajaram.regupathy@intel.com,
saranya.gopal@intel.com, linux-kernel@vger.kernel.org
Subject: [PATCH v1 3/4] usb: typec: ucsi: Set power role based on UCSI charge control
Date: Wed, 17 Jul 2024 00:49:48 +0000 [thread overview]
Message-ID: <20240717004949.3638557-4-jthies@google.com> (raw)
In-Reply-To: <20240717004949.3638557-1-jthies@google.com>
Add POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX as a property to the UCSI
power supply driver. When set to a negative value, set power role to
TYPEC_SOURCE, otherwise set the power role to TYPEC_SINK.
Signed-off-by: Jameson Thies <jthies@google.com>
---
drivers/usb/typec/ucsi/psy.c | 46 ++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/drivers/usb/typec/ucsi/psy.c b/drivers/usb/typec/ucsi/psy.c
index 45113e013696..feb344cb7ac8 100644
--- a/drivers/usb/typec/ucsi/psy.c
+++ b/drivers/usb/typec/ucsi/psy.c
@@ -30,6 +30,7 @@ static enum power_supply_property ucsi_psy_props[] = {
POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_SCOPE,
POWER_SUPPLY_PROP_STATUS,
+ POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
};
static int ucsi_psy_get_scope(struct ucsi_connector *con,
@@ -270,11 +271,54 @@ static int ucsi_psy_get_prop(struct power_supply *psy,
return ucsi_psy_get_scope(con, val);
case POWER_SUPPLY_PROP_STATUS:
return ucsi_psy_get_status(con, val);
+ case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX:
+ val->intval = 0;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+}
+
+static int ucsi_psy_set_charge_control_limit_max(struct ucsi_connector *con,
+ const union power_supply_propval *val)
+{
+ enum typec_role role;
+ /*
+ * Writing a negative value to the charge control limit max implies the
+ * port should not accept charge. Set the power role to source for a
+ * negative charge control limit, and sink otherwise.
+ */
+ if (val->intval < 0)
+ role = TYPEC_SOURCE;
+ else
+ role = TYPEC_SINK;
+
+ if (!con->typec_cap.ops || !con->typec_cap.ops->pr_set)
+ return -EINVAL;
+
+ return con->typec_cap.ops->pr_set(con->port, role);
+}
+
+static int ucsi_psy_set_prop(struct power_supply *psy,
+ enum power_supply_property psp,
+ const union power_supply_propval *val)
+{
+ struct ucsi_connector *con = power_supply_get_drvdata(psy);
+
+ switch (psp) {
+ case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX:
+ return ucsi_psy_set_charge_control_limit_max(con, val);
default:
return -EINVAL;
}
}
+static int ucsi_psy_prop_is_writeable(struct power_supply *psy,
+ enum power_supply_property psp)
+{
+ return psp == POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX;
+}
+
static enum power_supply_usb_type ucsi_psy_usb_types[] = {
POWER_SUPPLY_USB_TYPE_C,
POWER_SUPPLY_USB_TYPE_PD,
@@ -303,6 +347,8 @@ int ucsi_register_port_psy(struct ucsi_connector *con)
con->psy_desc.properties = ucsi_psy_props;
con->psy_desc.num_properties = ARRAY_SIZE(ucsi_psy_props);
con->psy_desc.get_property = ucsi_psy_get_prop;
+ con->psy_desc.set_property = ucsi_psy_set_prop;
+ con->psy_desc.property_is_writeable = ucsi_psy_prop_is_writeable;
con->psy = power_supply_register(dev, &con->psy_desc, &psy_cfg);
--
2.45.2.1089.g2a221341d9-goog
next prev parent reply other threads:[~2024-07-17 0:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-17 0:49 [PATCH v1 0/4] usb: typec: ucsi: Expand power supply support Jameson Thies
2024-07-17 0:49 ` [PATCH v1 1/4] usb: typec: ucsi: Add status to UCSI power supply driver Jameson Thies
2024-07-17 0:49 ` [PATCH v1 2/4] usb: typec: ucsi: Add USB PD DRP to USB type Jameson Thies
2024-07-17 0:49 ` Jameson Thies [this message]
2024-07-22 22:03 ` [PATCH v1 3/4] usb: typec: ucsi: Set power role based on UCSI charge control Jameson Thies
2024-07-17 0:49 ` [PATCH v1 4/4] usb: typec: ucsi: Fix SET_PDR typo in UCSI header file Jameson Thies
2024-07-17 7:56 ` neil.armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240717004949.3638557-4-jthies@google.com \
--to=jthies@google.com \
--cc=abhishekpandit@chromium.org \
--cc=andersson@kernel.org \
--cc=bleung@google.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=fabrice.gasnier@foss.st.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=rajaram.regupathy@intel.com \
--cc=saranya.gopal@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox