Skip to contentSkip to conversation

patch "usb: chipidea: msm: Ensure proper controller reset using role switch" added to usb-linus

PATCH [email protected] 1 participant 1 message May 7, 2020

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: chipidea: msm: Ensure proper controller reset using role switch

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From 91edf63d5022bd0464788ffb4acc3d5febbaf81d Mon Sep 17 00:00:00 2001
From: Bryan O'Donoghue <[email protected]>
Date: Thu, 7 May 2020 08:49:18 +0800
Subject: usb: chipidea: msm: Ensure proper controller reset using role switch
API

Currently we check to make sure there is no error state on the extcon handle for VBUS when writing to the HS_PHY_GENCONFIG_2 register. When using the USB role-switch API we still need to write to this register absent an extcon handle.

This patch makes the appropriate update to ensure the write happens if role-switching is true.

Fixes 05559f10ed79 ("usb: chipidea: add role switch class support")
Cc stable <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Stephen Boyd <[email protected]>
---
 drivers/usb/chipidea/ci_hdrc_msm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/chipidea/ci_hdrc_msm.c +1 -1
index af648ba6544d..46105457e1ca 100644
@@ -114,7 +114,7 @@ static int ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
 			hw_write_id_reg(ci, HS_PHY_GENCONFIG_2,
 					HS_PHY_ULPI_TX_PKT_EN_CLR_FIX, 0);
 
-		if (!IS_ERR(ci->platdata->vbus_extcon.edev)) {
+		if (!IS_ERR(ci->platdata->vbus_extcon.edev) || ci->role_switch) {
 			hw_write_id_reg(ci, HS_PHY_GENCONFIG_2,
 					HS_PHY_SESS_VLD_CTRL_EN,
 					HS_PHY_SESS_VLD_CTRL_EN);
Signature · 1 line
2.26.2