]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: typec: tcpm: allow to use sink in accessory mode
authorMichael Grzeschik <m.grzeschik@pengutronix.de>
Thu, 3 Apr 2025 22:43:04 +0000 (00:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Aug 2025 08:48:44 +0000 (09:48 +0100)
commit 64843d0ba96d3eae297025562111d57585273366 upstream.

Since the function tcpm_acc_attach is not setting the data and role for
for the sink case we extend it to check for it first.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250404-ml-topic-tcpm-v1-1-b99f44badce8@pengutronix.de
Stable-dep-of: bec15191d523 ("usb: typec: tcpm: apply vbus before data bringup in tcpm_src_attach")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/tcpm/tcpm.c

index 9838a2c8c1b857b484712e1b4dcf925ad31369c1..c72b108199c403316d5cd3280e2284f8909026eb 100644 (file)
@@ -4537,12 +4537,17 @@ static void tcpm_snk_detach(struct tcpm_port *port)
 static int tcpm_acc_attach(struct tcpm_port *port)
 {
        int ret;
+       enum typec_role role;
+       enum typec_data_role data;
 
        if (port->attached)
                return 0;
 
-       ret = tcpm_set_roles(port, true, TYPEC_SOURCE,
-                            tcpm_data_role_for_source(port));
+       role = tcpm_port_is_sink(port) ? TYPEC_SINK : TYPEC_SOURCE;
+       data = tcpm_port_is_sink(port) ? tcpm_data_role_for_sink(port)
+                                      : tcpm_data_role_for_source(port);
+
+       ret = tcpm_set_roles(port, true, role, data);
        if (ret < 0)
                return ret;