Revert "usb: typec: tcpm: fix cc role at port reset"

This reverts commit 1e35f07439.

Seems to break Pixel 6 testing so revert for now.  Will need to come
back later.

Bug: 298207935
Reported-by: André Draszik <draszik@google.com>
Change-Id: I8fec8b7ae1b508b963c3bc78ae9308e791a2ef66
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 49836fa33188dd4cdabe1df3dfb1ff589c0a3d9b)
[ta: the change was removed in commit 5032efbbcf ("ANDROID: bring back
typec charger changes."), add it again.]
Signed-off-by: Tudor Ambarus <tudordana@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-01-03 16:03:29 +00:00
parent 4ca89435eb
commit 2e578056db
+1 -2
View File
@@ -4861,8 +4861,7 @@ static void run_state_machine(struct tcpm_port *port)
break;
case PORT_RESET:
tcpm_reset_port(port);
tcpm_set_cc(port, tcpm_default_state(port) == SNK_UNATTACHED ?
TYPEC_CC_RD : tcpm_rp_cc(port));
tcpm_set_cc(port, TYPEC_CC_OPEN);
tcpm_set_state(port, PORT_RESET_WAIT_OFF,
PD_T_ERROR_RECOVERY);
break;