diff options
Diffstat (limited to 'queue-5.15')
3 files changed, 5 insertions, 5 deletions
diff --git a/queue-5.15/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch b/queue-5.15/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch index 4815e587e19..90bfbbe5238 100644 --- a/queue-5.15/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch +++ b/queue-5.15/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch @@ -58,8 +58,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -@@ -699,7 +699,8 @@ static void rockchip_chg_detect_work(str - if (!rport->suspended) +@@ -701,7 +701,8 @@ static void rockchip_chg_detect_work(str + if (!rport->suspended && !vbus_attach) rockchip_usb2phy_power_off(rport->phy); /* put the controller in non-driving mode */ - property_enable(base, &rphy->phy_cfg->chg_det.opmode, false); @@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* Start DCD processing stage 1 */ rockchip_chg_enable_dcd(rphy, true); rphy->chg_state = USB_CHG_STATE_WAIT_FOR_DCD; -@@ -763,7 +764,8 @@ static void rockchip_chg_detect_work(str +@@ -765,7 +766,8 @@ static void rockchip_chg_detect_work(str fallthrough; case USB_CHG_STATE_DETECTED: /* put the controller in normal mode */ diff --git a/queue-5.15/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch b/queue-5.15/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch index 1002732521b..0248e8c2bb1 100644 --- a/queue-5.15/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch +++ b/queue-5.15/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch @@ -85,4 +85,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + if (!rport->suspended && !vbus_attach) rockchip_usb2phy_power_off(rport->phy); /* put the controller in non-driving mode */ - if (!vbus_attach) + property_enable(base, &rphy->phy_cfg->chg_det.opmode, false); diff --git a/queue-5.15/series b/queue-5.15/series index 15cd3f9f5a8..0de9da108cf 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -22,8 +22,8 @@ hid-usbhid-paper-over-wrong-bnumdescriptor-field.patch alsa-pcm-improve-the-fix-for-race-of-buffer-access-at-pcm-oss-layer.patch net-can-j1939-j1939_xtp_rx_rts_session_active-deactivate-session-upon-receiving-the-second-rts.patch x86-kaslr-recognize-all-zone_device-users-as-physaddr-consumers.patch -phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch +phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch phy-tegra-xusb-explicitly-configure-hs_discon_level-to-0x7.patch usb-dwc3-check-for-usb4-ip_name.patch usb-ohci-uhci-add-soft-dependencies-on-ehci_platform.patch |