From ebde815c27cd370b21ce875b987f2f37f9cb2958 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 29 Jan 2024 08:30:27 -0500 Subject: [PATCH] Drop arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch from 5.15 --- ...8150-fix-usb-dp-dm-hs-phy-interrupts.patch | 66 ------------------- 1 file changed, 66 deletions(-) delete mode 100644 queue-5.15/arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch diff --git a/queue-5.15/arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch b/queue-5.15/arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch deleted file mode 100644 index 3e0fd96390c..00000000000 --- a/queue-5.15/arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 134de5e831775e8b178db9b131c1d3769a766982 Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Wed, 13 Dec 2023 18:34:02 +0100 -Subject: arm64: dts: qcom: sm8150: fix USB DP/DM HS PHY interrupts - -From: Johan Hovold - -commit 134de5e831775e8b178db9b131c1d3769a766982 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: 54524b6987d1 ("arm64: dts: qcom: sm8150: fix USB wakeup interrupt types") -Fixes: 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes") -Fixes: b33d2868e8d3 ("arm64: dts: qcom: sm8150: Add USB and PHY device nodes") -Cc: stable@vger.kernel.org # 5.10 -Cc: Jack Pham -Cc: Jonathan Marek -Signed-off-by: Johan Hovold -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20231213173403.29544-5-johan+linaro@kernel.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sm8150.dtsi | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - ---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi -@@ -3092,10 +3092,10 @@ - <&gcc GCC_USB30_PRIM_MASTER_CLK>; - assigned-clock-rates = <19200000>, <200000000>; - -- interrupts = , -- , -- , -- ; -+ interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, -+ <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc 8 IRQ_TYPE_EDGE_BOTH>, -+ <&pdc 9 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "hs_phy_irq", "ss_phy_irq", - "dm_hs_phy_irq", "dp_hs_phy_irq"; - -@@ -3137,10 +3137,10 @@ - <&gcc GCC_USB30_SEC_MASTER_CLK>; - assigned-clock-rates = <19200000>, <200000000>; - -- interrupts = , -- , -- , -- ; -+ interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, -+ <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc 10 IRQ_TYPE_EDGE_BOTH>, -+ <&pdc 11 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "hs_phy_irq", "ss_phy_irq", - "dm_hs_phy_irq", "dp_hs_phy_irq"; - -- 2.47.3