Drop arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch from 5.4

diff --git a/queue-5.4/arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch b/queue-5.4/arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch
deleted file mode 100644 (file)
index 019e033..0000000
--- a/queue-5.4/arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 204f9ed4bad6293933179517624143b8f412347c Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan+linaro@kernel.org>
-Date: Wed, 13 Dec 2023 18:34:00 +0100
-Subject: arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY interrupts
-
-From: Johan Hovold <johan+linaro@kernel.org>
-
-commit 204f9ed4bad6293933179517624143b8f412347c upstream.
-
-The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt
-controller in order to be able to wake the system up from low-power
-states and to be able to detect disconnect events, which requires
-triggering on falling edges.
-
-A recent commit updated the trigger type but failed to change the
-interrupt provider as required. This leads to the current Linux driver
-failing to probe instead of printing an error during suspend and USB
-wakeup not working as intended.
-
-Fixes: 84ad9ac8d9ca ("arm64: dts: qcom: sdm845: fix USB wakeup interrupt types")
-Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes")
-Cc: stable@vger.kernel.org      # 4.20
-Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Link: https://lore.kernel.org/r/20231213173403.29544-3-johan+linaro@kernel.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/qcom/sdm845.dtsi |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-@@ -2501,10 +2501,10 @@
-                                         <&gcc GCC_USB30_PRIM_MASTER_CLK>;
-                       assigned-clock-rates = <19200000>, <150000000>;
- 
--                      interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
--                                   <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
--                                   <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,
--                                   <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;
-+                      interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
-+                                            <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
-+                                            <&pdc_intc 8 IRQ_TYPE_EDGE_BOTH>,
-+                                            <&pdc_intc 9 IRQ_TYPE_EDGE_BOTH>;
-                       interrupt-names = "hs_phy_irq", "ss_phy_irq",
-                                         "dm_hs_phy_irq", "dp_hs_phy_irq";
- 
-@@ -2545,10 +2545,10 @@
-                                         <&gcc GCC_USB30_SEC_MASTER_CLK>;
-                       assigned-clock-rates = <19200000>, <150000000>;
- 
--                      interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
--                                   <GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
--                                   <GIC_SPI 490 IRQ_TYPE_EDGE_BOTH>,
--                                   <GIC_SPI 491 IRQ_TYPE_EDGE_BOTH>;
-+                      interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
-+                                            <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
-+                                            <&pdc_intc 10 IRQ_TYPE_EDGE_BOTH>,
-+                                            <&pdc_intc 11 IRQ_TYPE_EDGE_BOTH>;
-                       interrupt-names = "hs_phy_irq", "ss_phy_irq",
-                                         "dm_hs_phy_irq", "dp_hs_phy_irq";
- 

diff --git a/queue-5.4/series b/queue-5.4/series
index 29c31b7884e59513a561b9843f6e6340e3e82ccc..a515eaaad189477cafd8ffa092761aa65866c0c4 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -13,7 +13,6 @@ hwrng-core-fix-page-fault-dead-lock-on-mmap-ed-hwrng.patch
 rpmsg-virtio-free-driver_override-when-rpmsg_remove.patch
 parisc-firmware-fix-f-extend-for-pdc-addresses.patch
 arm64-dts-qcom-sdm845-fix-usb-wakeup-interrupt-types.patch
-arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch
 mmc-core-use-mrq.sbc-in-close-ended-ffu.patch
 nouveau-vmm-don-t-set-addr-on-the-fail-path-to-avoid-warning.patch
 ubifs-ubifs_symlink-fix-memleak-of-inode-i_link-in-error-path.patch