platform/chrome: cros_ec_typec: Store cable plug type

Use the PD VDO Type C cable plug type macro to retrieve and store the
cable plug type in the cable descriptor.

Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20201116201150.2919178-9-pmalani@chromium.org

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 8ecf2ed..c0f34aa 100644 (file)
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -707,6 +707,7 @@ static int cros_typec_handle_sop_prime_disc(struct cros_typec_data *typec, int p
                .port = port_num,
                .partner_type = TYPEC_PARTNER_SOP_PRIME,
        };
+       u32 cable_plug_type;
        int ret = 0;
 
        memset(disc, 0, EC_PROTO2_MAX_RESPONSE_SIZE);
@@ -720,8 +721,26 @@ static int cros_typec_handle_sop_prime_disc(struct cros_typec_data *typec, int p
        /* Parse the PD identity data, even if only 0s were returned. */
        cros_typec_parse_pd_identity(&port->c_identity, disc);
 
-       if (disc->identity_count != 0)
+       if (disc->identity_count != 0) {
+               cable_plug_type = VDO_TYPEC_CABLE_TYPE(port->c_identity.vdo[0]);
+               switch (cable_plug_type) {
+               case CABLE_ATYPE:
+                       desc.type = USB_PLUG_TYPE_A;
+                       break;
+               case CABLE_BTYPE:
+                       desc.type = USB_PLUG_TYPE_B;
+                       break;
+               case CABLE_CTYPE:
+                       desc.type = USB_PLUG_TYPE_C;
+                       break;
+               case CABLE_CAPTIVE:
+                       desc.type = USB_PLUG_CAPTIVE;
+                       break;
+               default:
+                       desc.type = USB_PLUG_NONE;
+               }
                desc.active = PD_IDH_PTYPE(port->c_identity.id_header) == IDH_PTYPE_ACABLE;
+       }
 
        desc.identity = &port->c_identity;