On Wed, Apr 22, 2020 at 03:22:41PM -0700, Prashant Malani wrote:
> 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@xxxxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/platform/chrome/cros_ec_typec.c | 47 +++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
> index eda57db26f8d..324ead297c4d 100644
> --- a/drivers/platform/chrome/cros_ec_typec.c
> +++ b/drivers/platform/chrome/cros_ec_typec.c
> @@ -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_info(dev, "Mux handle not found.\n");
> + goto mux_err;
> + }
> +
> + port->ori_sw = fwnode_typec_switch_get(fwnode);
> + if (IS_ERR(port->ori_sw)) {
> + dev_info(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_info(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_info(dev, "No switch control for port %d\n",
> + port_num);
> }
>
> return 0;
> --
> 2.26.1.301.g55bc3eb7cb9-goog
thanks,
--
heikki
