From: Badhri Jagan Sridharan <badhri@google.com>
To: Guenter Roeck <linux@roeck-us.net>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Kyle Tso <kyletso@google.com>,
Badhri Jagan Sridharan <badhri@google.com>
Subject: [PATCH v2 2/2] usb: typec: tcpci_maxim: configure charging & data paths
Date: Thu, 11 Mar 2021 21:24:43 -0800 [thread overview]
Message-ID: <20210312052443.3797674-2-badhri@google.com> (raw)
In-Reply-To: <20210312052443.3797674-1-badhri@google.com>
The change exposes the data_role and the orientation as a extcon
interface for configuring the USB data controller.
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
---
Changes since V1:
- Dropped changes related to get_/set_current_limit and pd_capable
callback. Will send them in as separate patches.
---
drivers/usb/typec/tcpm/tcpci_maxim.c | 56 ++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c
index 041a1c393594..1210445713ee 100644
--- a/drivers/usb/typec/tcpm/tcpci_maxim.c
+++ b/drivers/usb/typec/tcpm/tcpci_maxim.c
@@ -7,6 +7,8 @@
#include <linux/interrupt.h>
#include <linux/i2c.h>
+#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/regmap.h>
@@ -46,6 +48,8 @@ struct max_tcpci_chip {
struct device *dev;
struct i2c_client *client;
struct tcpm_port *port;
+ bool attached;
+ struct extcon_dev *extcon;
};
static const struct regmap_range max_tcpci_tcpci_range[] = {
@@ -439,6 +443,39 @@ static int tcpci_init(struct tcpci *tcpci, struct tcpci_data *data)
return -1;
}
+static void max_tcpci_set_roles(struct tcpci *tcpci, struct tcpci_data *data, bool attached,
+ enum typec_role role, enum typec_data_role data_role)
+{
+ struct max_tcpci_chip *chip = tdata_to_max_tcpci(data);
+
+ chip->attached = attached;
+
+ if (!attached) {
+ extcon_set_state_sync(chip->extcon, EXTCON_USB_HOST, 0);
+ extcon_set_state_sync(chip->extcon, EXTCON_USB, 0);
+ return;
+ }
+
+ extcon_set_state_sync(chip->extcon, data_role == TYPEC_HOST ? EXTCON_USB_HOST : EXTCON_USB,
+ 1);
+}
+
+static void max_tcpci_set_cc_polarity(struct tcpci *tcpci, struct tcpci_data *data,
+ enum typec_cc_polarity polarity)
+{
+ struct max_tcpci_chip *chip = tdata_to_max_tcpci(data);
+
+ extcon_set_property(chip->extcon, EXTCON_USB, EXTCON_PROP_USB_TYPEC_POLARITY,
+ (union extcon_property_value)(int)polarity);
+ extcon_set_property(chip->extcon, EXTCON_USB_HOST, EXTCON_PROP_USB_TYPEC_POLARITY,
+ (union extcon_property_value)(int)polarity);
+}
+
+static const unsigned int usbpd_extcon[] = {
+ EXTCON_USB,
+ EXTCON_USB_HOST,
+};
+
static int max_tcpci_probe(struct i2c_client *client, const struct i2c_device_id *i2c_id)
{
int ret;
@@ -472,6 +509,8 @@ static int max_tcpci_probe(struct i2c_client *client, const struct i2c_device_id
chip->data.auto_discharge_disconnect = true;
chip->data.vbus_vsafe0v = true;
chip->data.set_partner_usb_comm_capable = max_tcpci_set_partner_usb_comm_capable;
+ chip->data.set_roles = max_tcpci_set_roles;
+ chip->data.set_cc_polarity = max_tcpci_set_cc_polarity;
max_tcpci_init_regs(chip);
chip->tcpci = tcpci_register_port(chip->dev, &chip->data);
@@ -484,6 +523,23 @@ static int max_tcpci_probe(struct i2c_client *client, const struct i2c_device_id
if (ret < 0)
goto unreg_port;
+ chip->extcon = devm_extcon_dev_allocate(&client->dev, usbpd_extcon);
+ if (IS_ERR(chip->extcon)) {
+ dev_err(&client->dev, "Error allocating extcon: %ld\n", PTR_ERR(chip->extcon));
+ ret = PTR_ERR(chip->extcon);
+ goto unreg_port;
+ }
+
+ ret = devm_extcon_dev_register(&client->dev, chip->extcon);
+ if (ret < 0) {
+ dev_err(&client->dev, "failed to register extcon device");
+ goto unreg_port;
+ }
+
+ extcon_set_property_capability(chip->extcon, EXTCON_USB, EXTCON_PROP_USB_TYPEC_POLARITY);
+ extcon_set_property_capability(chip->extcon, EXTCON_USB_HOST,
+ EXTCON_PROP_USB_TYPEC_POLARITY);
+
device_init_wakeup(chip->dev, true);
return 0;
--
2.31.0.rc2.261.g7f71774620-goog
next prev parent reply other threads:[~2021-03-12 5:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 5:24 [PATCH v2 1/2] usb: typec: tcpci: Add tcpc chip level callbacks Badhri Jagan Sridharan
2021-03-12 5:24 ` Badhri Jagan Sridharan [this message]
2021-03-12 6:39 ` [PATCH v2 2/2] usb: typec: tcpci_maxim: configure charging & data paths Guenter Roeck
2021-03-12 7:04 ` Badhri Jagan Sridharan
2021-03-12 9:01 ` Heikki Krogerus
2021-03-12 6:33 ` [PATCH v2 1/2] usb: typec: tcpci: Add tcpc chip level callbacks Greg Kroah-Hartman
2021-03-12 6:34 ` Greg Kroah-Hartman
2021-03-12 7:06 ` Badhri Jagan Sridharan
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=20210312052443.3797674-2-badhri@google.com \
--to=badhri@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=kyletso@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
/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