]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
platform/chrome: cros_ec_typec: Register Type C switches
authorPrashant Malani <pmalani@chromium.org>
Tue, 19 May 2020 21:46:04 +0000 (14:46 -0700)
committerEnric Balletbo i Serra <enric.balletbo@collabora.com>
Fri, 19 Jun 2020 17:16:18 +0000 (19:16 +0200)
Register Type C mux and switch handles, when provided via firmware
bindings. These will allow the cros-ec-typec driver, and also alternate
mode drivers to configure connected Muxes correctly, according to PD
information retrieved from the Chrome OS EC.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
drivers/platform/chrome/cros_ec_typec.c

index 66b8d21092afb5efbac93dd1942b14da57ffef99..6e79f917314bf96e11a531a9e6a934c21ed724d9 100644 (file)
@@ -14,6 +14,8 @@
 #include <linux/platform_data/cros_usbpd_notify.h>
 #include <linux/platform_device.h>
 #include <linux/usb/typec.h>
+#include <linux/usb/typec_mux.h>
+#include <linux/usb/role.h>
 
 #define DRV_NAME "cros-ec-typec"
 
@@ -25,6 +27,9 @@ struct cros_typec_port {
        struct typec_partner *partner;
        /* Port partner PD identity info. */
        struct usb_pd_identity p_identity;
+       struct typec_switch *ori_sw;
+       struct typec_mux *mux;
+       struct usb_role_switch *role_sw;
 };
 
 /* Platform-specific data for the Chrome OS EC Type C controller. */
@@ -84,6 +89,40 @@ static int cros_typec_parse_port_props(struct typec_capability *cap,
        return 0;
 }
 
+static int cros_typec_get_switch_handles(struct cros_typec_port *port,
+                                        struct fwnode_handle *fwnode,
+                                        struct device *dev)
+{
+       port->mux = fwnode_typec_mux_get(fwnode, NULL);
+       if (IS_ERR(port->mux)) {
+               dev_dbg(dev, "Mux handle not found.\n");
+               goto mux_err;
+       }
+
+       port->ori_sw = fwnode_typec_switch_get(fwnode);
+       if (IS_ERR(port->ori_sw)) {
+               dev_dbg(dev, "Orientation switch handle not found.\n");
+               goto ori_sw_err;
+       }
+
+       port->role_sw = fwnode_usb_role_switch_get(fwnode);
+       if (IS_ERR(port->role_sw)) {
+               dev_dbg(dev, "USB role switch handle not found.\n");
+               goto role_sw_err;
+       }
+
+       return 0;
+
+role_sw_err:
+       usb_role_switch_put(port->role_sw);
+ori_sw_err:
+       typec_switch_put(port->ori_sw);
+mux_err:
+       typec_mux_put(port->mux);
+
+       return -ENODEV;
+}
+
 static void cros_unregister_ports(struct cros_typec_data *typec)
 {
        int i;
@@ -91,6 +130,9 @@ static void cros_unregister_ports(struct cros_typec_data *typec)
        for (i = 0; i < typec->num_ports; i++) {
                if (!typec->ports[i])
                        continue;
+               usb_role_switch_put(typec->ports[i]->role_sw);
+               typec_switch_put(typec->ports[i]->ori_sw);
+               typec_mux_put(typec->ports[i]->mux);
                typec_unregister_port(typec->ports[i]->port);
        }
 }
@@ -153,6 +195,11 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
                        ret = PTR_ERR(cros_port->port);
                        goto unregister_ports;
                }
+
+               ret = cros_typec_get_switch_handles(cros_port, fwnode, dev);
+               if (ret)
+                       dev_dbg(dev, "No switch control for port %d\n",
+                               port_num);
        }
 
        return 0;