reorder some patches

diff --git a/queue-5.10/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch b/queue-5.10/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch
index 4815e587e198659ed7ee9259cb2b8209de538c41..90bfbbe52385a7730afa42f6f09e718d318b02ff 100644 (file)
--- a/queue-5.10/phy-rockchip-inno-usb2-fix-communication-disruption-in-gadget-mode.patch
+++ b/queue-5.10/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.10/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch b/queue-5.10/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch
index 1002732521be9c1e51636ba7a497de5c58e50b29..0248e8c2bb1c24f2918265d2ef147e2b8fd5087a 100644 (file)
--- a/queue-5.10/phy-rockchip-inno-usb2-fix-disconnection-in-gadget-mode.patch
+++ b/queue-5.10/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.10/series b/queue-5.10/series
index 3b6661038f7956119bf7b8592bdeca2e339952cc..4a12a86a621a218c884b82fe9f080cc995faefb8 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -18,8 +18,8 @@ dmaengine-omap-dma-fix-dma_pool-resource-leak-in-err.patch
 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
-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

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 4815e587e198659ed7ee9259cb2b8209de538c41..90bfbbe52385a7730afa42f6f09e718d318b02ff 100644 (file)
--- 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 1002732521be9c1e51636ba7a497de5c58e50b29..0248e8c2bb1c24f2918265d2ef147e2b8fd5087a 100644 (file)
--- 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 15cd3f9f5a8bb211e11d9edc002dc039d96bc6cb..0de9da108cfde480eb99c7b7a64db973c33986d2 100644 (file)
--- 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

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 466412e88a1b6257ce3c860bf4d873167f363dd1..3490444225ee121d185217d59dabbb062ae575b5 100644 (file)
--- 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 8bdcf294b9586a8425e19f92cae5d5ec9a068449..37eea98dfc39ea8d8ca96162afd5ee808e9081bb 100644 (file)
--- 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 0c47a635d7ee86bd9c9360e5975c2e8f0b77e089..4d99c261166c8f9823c0f77245ccb6ab0fe3b00d 100644 (file)
--- 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