This is a note to let you know that I've just added the patch titled
ARM: dts: qcom: sdx55: fix USB DP/DM HS PHY interrupts
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-dts-qcom-sdx55-fix-usb-dp-dm-hs-phy-interrupts.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From de95f139394a5ed82270f005bc441d2e7c1e51b7 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Wed, 13 Dec 2023 18:31:30 +0100
Subject: ARM: dts: qcom: sdx55: fix USB DP/DM HS PHY interrupts
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit de95f139394a5ed82270f005bc441d2e7c1e51b7 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: d0ec3c4c11c3 ("ARM: dts: qcom: sdx55: fix USB wakeup interrupt types")
Fixes: fea4b41022f3 ("ARM: dts: qcom: sdx55: Add USB3 and PHY support")
Cc: stable@xxxxxxxxxxxxxxx # 5.12
Cc: Manivannan Sadhasivam <mani@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20231213173131.29436-3-johan+linaro@xxxxxxxxxx
Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
@@ -592,10 +592,10 @@
<&gcc GCC_USB30_MASTER_CLK>;
assigned-clock-rates = <19200000>, <200000000>;
- interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 158 IRQ_TYPE_EDGE_BOTH>,
- <GIC_SPI 157 IRQ_TYPE_EDGE_BOTH>;
+ interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+ <&intc GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+ <&pdc 11 IRQ_TYPE_EDGE_BOTH>,
+ <&pdc 10 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "hs_phy_irq", "ss_phy_irq",
"dm_hs_phy_irq", "dp_hs_phy_irq";
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.6/arm64-dts-qcom-sm8150-fix-usb-wakeup-interrupt-types.patch
queue-6.6/arm64-dts-qcom-sc8180x-fix-usb-dp-dm-hs-phy-interrupts.patch
queue-6.6/arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch
queue-6.6/arm64-dts-qcom-sdm670-fix-usb-dp-dm-hs-phy-interrupts.patch
queue-6.6/arm64-dts-qcom-sdm670-fix-usb-wakeup-interrupt-types.patch
queue-6.6/arm64-dts-qcom-sc7180-fix-usb-wakeup-interrupt-types.patch
queue-6.6/soc-qcom-pmic_glink_altmode-fix-port-sanity-check.patch
queue-6.6/arm64-dts-qcom-sc8280xp-crd-fix-edp-phy-compatible.patch
queue-6.6/arm64-dts-qcom-sdm845-fix-usb-wakeup-interrupt-types.patch
queue-6.6/arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch
queue-6.6/arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch
queue-6.6/arm64-dts-qcom-sc7280-fix-usb_1-wakeup-interrupt-types.patch
queue-6.6/arm64-dts-qcom-sc8180x-fix-usb-ss-wakeup.patch
queue-6.6/arm64-dts-qcom-sc8180x-fix-usb-wakeup-interrupt-types.patch
queue-6.6/arm-dts-qcom-sdx55-fix-pdc-interrupt-cells.patch
queue-6.6/arm-dts-qcom-sdx55-fix-usb-dp-dm-hs-phy-interrupts.patch
queue-6.6/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch
queue-6.6/arm-dts-qcom-sdx55-fix-usb-ss-wakeup.patch
queue-6.6/arm64-dts-qcom-sdm670-fix-usb-ss-wakeup.patch
queue-6.6/arm-dts-qcom-sdx55-fix-usb-wakeup-interrupt-types.patch
