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.
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
drivers/usb/typec/ucsi/ucsi_glink.c | 54 ++++++++++++++++++++++++++++++++++++-
1 file changed, 53 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c
index bb1854b3311d..db6e248f8208 100644
--- a/drivers/usb/typec/ucsi/ucsi_glink.c
+++ b/drivers/usb/typec/ucsi/ucsi_glink.c
@@ -8,9 +8,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
@@ -52,6 +56,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;
@@ -220,8 +227,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;
@@ -282,6 +301,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);
@@ -309,6 +329,38 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
ucsi_set_drvdata(ucsi->ucsi, ucsi);
+ device_for_each_child_node(dev, fwnode) {
+ struct gpio_desc *desc;
+ 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;
+ }
+
+ desc = devm_gpiod_get_index_optional(&adev->dev, "orientation", port, GPIOD_IN);
+
+ /* If GPIO isn't found, continue */
+ if (!desc)
+ continue;
+
+ if (IS_ERR(desc))
+ return dev_err_probe(dev, PTR_ERR(desc),
+ "unable to acquire orientation gpio\n");
+ ucsi->port_orientation[port] = desc;
+
+ 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.1On Mon, 2 Oct 2023 at 13:21, Neil Armstrong <neil.armstrong@linaro.org> 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. Have you checked, which UCSI version is implemented on SM8550? Is there any chance of GET_CONNECTOR_STATUS / bit 86 actually reflecting the correct orientation? > > Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- -- With best wishes Dmitry
On 02/10/2023 19:26, Dmitry Baryshkov wrote: > On Mon, 2 Oct 2023 at 13:21, Neil Armstrong <neil.armstrong@linaro.org> 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. > > Have you checked, which UCSI version is implemented on SM8550? > Is there any chance of GET_CONNECTOR_STATUS / bit 86 actually > reflecting the correct orientation? I checked, and no, the UCSI implementation is based on the UCSI 1.x spec, and doesn't have the UCSI 2.x new bits. Neil > >> >> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> >> --- > >
On Tue, 3 Oct 2023 at 10:13, Neil Armstrong <neil.armstrong@linaro.org> wrote: > > On 02/10/2023 19:26, Dmitry Baryshkov wrote: > > On Mon, 2 Oct 2023 at 13:21, Neil Armstrong <neil.armstrong@linaro.org> 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. > > > > Have you checked, which UCSI version is implemented on SM8550? > > Is there any chance of GET_CONNECTOR_STATUS / bit 86 actually > > reflecting the correct orientation? > > I checked, and no, the UCSI implementation is based on the UCSI 1.x spec, > and doesn't have the UCSI 2.x new bits. Ack, thanks for the confirmation. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > Neil > > > > >> > >> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > >> --- > > > > > -- With best wishes Dmitry
On 10/2/23 12:20, 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.
>
> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
[...]
> + device_for_each_child_node(dev, fwnode) {
> + struct gpio_desc *desc;
> + 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;
> + }
> +
> + desc = devm_gpiod_get_index_optional(&adev->dev, "orientation", port, GPIOD_IN);
Personally, I'd add a comment about this being a lookup on the
pmic-glink node, as dev is reused throughout this function
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
© 2016 - 2025 Red Hat, Inc.