diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-02-05 15:33:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-02-05 15:33:42 +0100 |
| commit | 55a4687fb8031f3c5c266c9fa93a80e22e22ba92 (patch) | |
| tree | 8a71c9f8f25b5639e29baaee937cf042f7ec040f /queue-6.1 | |
| parent | af7f59b585acd3417e35e09ecdba318603b594bb (diff) | |
| download | stable-queue-master.tar.gz | |
Diffstat (limited to 'queue-6.1')
3 files changed, 5 insertions, 5 deletions
diff --git a/queue-6.1/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch b/queue-6.1/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch index 466412e88a1..3490444225e 100644 --- a/queue-6.1/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch +++ b/queue-6.1/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 -@@ -717,7 +717,8 @@ static void rockchip_chg_detect_work(str - if (!rport->suspended) +@@ -719,7 +719,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; -@@ -780,7 +781,8 @@ static void rockchip_chg_detect_work(str +@@ -782,7 +783,8 @@ static void rockchip_chg_detect_work(str fallthrough; case USB_CHG_STATE_DETECTED: /* put the controller in normal mode */ diff --git a/queue-6.1/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch b/queue-6.1/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch index 8bdcf294b95..37eea98dfc3 100644 --- a/queue-6.1/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch +++ b/queue-6.1/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-6.1/series b/queue-6.1/series index 0c47a635d7e..4d99c261166 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -39,9 +39,9 @@ can-gs_usb-gs_usb_receive_bulk_callback-fix-urb-memory-leak.patch can-ctucanfd-fix-ssp_src-in-cases-when-bit-rate-is-higher-than-1-mbit.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-disconnection-in-gadget-mode.patch phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch phy-freescale-imx8m-pcie-assert-phy-reset-during-power-on.patch -phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch phy-tegra-xusb-explicitly-configure-hs_discon_level-to-0x7.patch usb-dwc3-check-for-usb4-ip_name.patch usb-core-add-usb_quirk_no_bos-for-devices-that-hang-on-bos-descriptor.patch |