diff mbox series

[RFC,3/7] usb: ucsi: glink: use the connector orientation GPIO to provide switch events

Message ID 20230601-topic-sm8550-upstream-type-c-v1-3-d4d97b4d8bab@linaro.org (mailing list archive)
State Superseded
Headers show
Series arm64: qcom: add Type-C Altmode support | expand

Commit Message

Neil Armstrong June 1, 2023, 2:07 p.m. UTC 
On SM8550, the non-altmode orientation is not given anymore within
altmode events, even with USB SVIDs events.

On the other side, the Type-C connector orientation is correctly
reported by a signal from the PMIC.

Take this gpio signal when we detect some Type-C port activity
to notify any Type-C switches tied to the Type-C port connectors.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 drivers/usb/typec/ucsi/ucsi_glink.c | 52 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

Comments

Heikki Krogerus June 5, 2023, 10:45 a.m. UTC | #1 
On Thu, Jun 01, 2023 at 04:07:03PM +0200, Neil Armstrong wrote:
> On SM8550, the non-altmode orientation is not given anymore within
> altmode events, even with USB SVIDs events.
> 
> On the other side, the Type-C connector orientation is correctly
> reported by a signal from the PMIC.
> 
> Take this gpio signal when we detect some Type-C port activity
> to notify any Type-C switches tied to the Type-C port connectors.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/ucsi/ucsi_glink.c | 52 ++++++++++++++++++++++++++++++++++++-
>  1 file changed, 51 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c
> index 1fe9cb5b6bd9..88491dbff7e3 100644
> --- a/drivers/usb/typec/ucsi/ucsi_glink.c
> +++ b/drivers/usb/typec/ucsi/ucsi_glink.c
> @@ -9,9 +9,13 @@
>  #include <linux/mutex.h>
>  #include <linux/property.h>
>  #include <linux/soc/qcom/pdr.h>
> +#include <linux/usb/typec_mux.h>
> +#include <linux/gpio/consumer.h>
>  #include <linux/soc/qcom/pmic_glink.h>
>  #include "ucsi.h"
>  
> +#define PMIC_GLINK_MAX_PORTS	2
> +
>  #define UCSI_BUF_SIZE                   48
>  
>  #define MSG_TYPE_REQ_RESP               1
> @@ -53,6 +57,9 @@ struct ucsi_notify_ind_msg {
>  struct pmic_glink_ucsi {
>  	struct device *dev;
>  
> +	struct gpio_desc *port_orientation[PMIC_GLINK_MAX_PORTS];
> +	struct typec_switch *port_switch[PMIC_GLINK_MAX_PORTS];
> +
>  	struct pmic_glink_client *client;
>  
>  	struct ucsi *ucsi;
> @@ -221,8 +228,20 @@ static void pmic_glink_ucsi_notify(struct work_struct *work)
>  	}
>  
>  	con_num = UCSI_CCI_CONNECTOR(cci);
> -	if (con_num)
> +	if (con_num) {
> +		if (con_num < PMIC_GLINK_MAX_PORTS &&
> +		    ucsi->port_orientation[con_num - 1]) {
> +			int orientation = gpiod_get_value(ucsi->port_orientation[con_num - 1]);
> +
> +			if (orientation >= 0) {
> +				typec_switch_set(ucsi->port_switch[con_num - 1],
> +						 orientation ? TYPEC_ORIENTATION_REVERSE
> +							     : TYPEC_ORIENTATION_NORMAL);
> +			}
> +		}
> +
>  		ucsi_connector_change(ucsi->ucsi, con_num);
> +	}
>  
>  	if (ucsi->sync_pending && cci & UCSI_CCI_BUSY) {
>  		ucsi->sync_val = -EBUSY;
> @@ -283,6 +302,7 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
>  {
>  	struct pmic_glink_ucsi *ucsi;
>  	struct device *dev = &adev->dev;
> +	struct fwnode_handle *fwnode;
>  	int ret;
>  
>  	ucsi = devm_kzalloc(dev, sizeof(*ucsi), GFP_KERNEL);
> @@ -310,6 +330,36 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
>  
>  	ucsi_set_drvdata(ucsi->ucsi, ucsi);
>  
> +	device_for_each_child_node(dev, fwnode) {
> +		u32 port;
> +
> +		ret = fwnode_property_read_u32(fwnode, "reg", &port);
> +		if (ret < 0) {
> +			dev_err(dev, "missing reg property of %pOFn\n", fwnode);
> +			return ret;
> +		}
> +
> +		if (port >= PMIC_GLINK_MAX_PORTS) {
> +			dev_warn(dev, "invalid connector number, ignoring\n");
> +			continue;
> +		}
> +
> +		ucsi->port_orientation[port] = devm_fwnode_gpiod_get(&adev->dev, fwnode,
> +								     "orientation",
> +								     GPIOD_IN, NULL);
> +		if (IS_ERR(ucsi->port_orientation[port]))
> +			return dev_err_probe(dev, PTR_ERR(ucsi->port_orientation[port]),
> +					     "unable to acquire orientation gpio\n");
> +
> +		if (!ucsi->port_orientation[port])
> +			continue;
> +
> +		ucsi->port_switch[port] = fwnode_typec_switch_get(fwnode);
> +		if (IS_ERR(ucsi->port_switch[port]))
> +			return dev_err_probe(dev, PTR_ERR(ucsi->port_switch[port]),
> +					"failed to acquire orientation-switch\n");
> +	}
> +
>  	ucsi->client = devm_pmic_glink_register_client(dev,
>  						       PMIC_GLINK_OWNER_USBC,
>  						       pmic_glink_ucsi_callback,
> 
> -- 
> 2.34.1
diff mbox series

Patch

diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c
index 1fe9cb5b6bd9..88491dbff7e3 100644
--- a/drivers/usb/typec/ucsi/ucsi_glink.c
+++ b/drivers/usb/typec/ucsi/ucsi_glink.c
@@ -9,9 +9,13 @@ 
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/soc/qcom/pdr.h>
+#include <linux/usb/typec_mux.h>
+#include <linux/gpio/consumer.h>
 #include <linux/soc/qcom/pmic_glink.h>
 #include "ucsi.h"
 
+#define PMIC_GLINK_MAX_PORTS	2
+
 #define UCSI_BUF_SIZE                   48
 
 #define MSG_TYPE_REQ_RESP               1
@@ -53,6 +57,9 @@  struct ucsi_notify_ind_msg {
 struct pmic_glink_ucsi {
 	struct device *dev;
 
+	struct gpio_desc *port_orientation[PMIC_GLINK_MAX_PORTS];
+	struct typec_switch *port_switch[PMIC_GLINK_MAX_PORTS];
+
 	struct pmic_glink_client *client;
 
 	struct ucsi *ucsi;
@@ -221,8 +228,20 @@  static void pmic_glink_ucsi_notify(struct work_struct *work)
 	}
 
 	con_num = UCSI_CCI_CONNECTOR(cci);
-	if (con_num)
+	if (con_num) {
+		if (con_num < PMIC_GLINK_MAX_PORTS &&
+		    ucsi->port_orientation[con_num - 1]) {
+			int orientation = gpiod_get_value(ucsi->port_orientation[con_num - 1]);
+
+			if (orientation >= 0) {
+				typec_switch_set(ucsi->port_switch[con_num - 1],
+						 orientation ? TYPEC_ORIENTATION_REVERSE
+							     : TYPEC_ORIENTATION_NORMAL);
+			}
+		}
+
 		ucsi_connector_change(ucsi->ucsi, con_num);
+	}
 
 	if (ucsi->sync_pending && cci & UCSI_CCI_BUSY) {
 		ucsi->sync_val = -EBUSY;
@@ -283,6 +302,7 @@  static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
 {
 	struct pmic_glink_ucsi *ucsi;
 	struct device *dev = &adev->dev;
+	struct fwnode_handle *fwnode;
 	int ret;
 
 	ucsi = devm_kzalloc(dev, sizeof(*ucsi), GFP_KERNEL);
@@ -310,6 +330,36 @@  static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
 
 	ucsi_set_drvdata(ucsi->ucsi, ucsi);
 
+	device_for_each_child_node(dev, fwnode) {
+		u32 port;
+
+		ret = fwnode_property_read_u32(fwnode, "reg", &port);
+		if (ret < 0) {
+			dev_err(dev, "missing reg property of %pOFn\n", fwnode);
+			return ret;
+		}
+
+		if (port >= PMIC_GLINK_MAX_PORTS) {
+			dev_warn(dev, "invalid connector number, ignoring\n");
+			continue;
+		}
+
+		ucsi->port_orientation[port] = devm_fwnode_gpiod_get(&adev->dev, fwnode,
+								     "orientation",
+								     GPIOD_IN, NULL);
+		if (IS_ERR(ucsi->port_orientation[port]))
+			return dev_err_probe(dev, PTR_ERR(ucsi->port_orientation[port]),
+					     "unable to acquire orientation gpio\n");
+
+		if (!ucsi->port_orientation[port])
+			continue;
+
+		ucsi->port_switch[port] = fwnode_typec_switch_get(fwnode);
+		if (IS_ERR(ucsi->port_switch[port]))
+			return dev_err_probe(dev, PTR_ERR(ucsi->port_switch[port]),
+					"failed to acquire orientation-switch\n");
+	}
+
 	ucsi->client = devm_pmic_glink_register_client(dev,
 						       PMIC_GLINK_OWNER_USBC,
 						       pmic_glink_ucsi_callback,