usb: chipidea: msm: Ensure proper controller reset using role switch API
commit5.4-rM2-2.2.x-imx-squashed91edf63d50
upstream. 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:05559f10ed
("usb: chipidea: add role switch class support") Cc: stable <stable@vger.kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Peter Chen <peter.chen@nxp.com> Link: https://lore.kernel.org/r/20200507004918.25975-2-peter.chen@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
2419a95517
commit
4f4dc27c09
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue