From: Sasha Levin Date: Sun, 28 Jan 2024 23:53:31 +0000 (-0500) Subject: Drop arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch from older trees X-Git-Tag: v6.1.76~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fede0b9c4c8f5228ec52b32b63696503b3f393cb;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch from older trees --- diff --git a/queue-5.15/arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch b/queue-5.15/arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch deleted file mode 100644 index 3ec89209500..00000000000 --- a/queue-5.15/arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cc4e1da491b84ca05339a19893884cda78f74aef Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Wed, 13 Dec 2023 18:34:03 +0100 -Subject: arm64: dts: qcom: sm8150: fix USB SS wakeup - -From: Johan Hovold - -commit cc4e1da491b84ca05339a19893884cda78f74aef upstream. - -The USB SS 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. - -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-6-johan+linaro@kernel.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi -@@ -3093,7 +3093,7 @@ - assigned-clock-rates = <19200000>, <200000000>; - - interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc 6 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 8 IRQ_TYPE_EDGE_BOTH>, - <&pdc 9 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "hs_phy_irq", "ss_phy_irq", -@@ -3138,7 +3138,7 @@ - assigned-clock-rates = <19200000>, <200000000>; - - interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc 7 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 10 IRQ_TYPE_EDGE_BOTH>, - <&pdc 11 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "hs_phy_irq", "ss_phy_irq", diff --git a/queue-5.15/series b/queue-5.15/series index f7ef0706250..7d09d68af2f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -30,7 +30,6 @@ arm64-dts-qcom-sdm845-fix-usb-wakeup-interrupt-types.patch arm64-dts-qcom-sm8150-fix-usb-wakeup-interrupt-types.patch arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch -arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch lsm-new-security_file_ioctl_compat-hook.patch scripts-get_abi-fix-source-path-leak.patch mmc-core-use-mrq.sbc-in-close-ended-ffu.patch diff --git a/queue-6.1/arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch b/queue-6.1/arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch deleted file mode 100644 index b6df9cd606d..00000000000 --- a/queue-6.1/arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cc4e1da491b84ca05339a19893884cda78f74aef Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Wed, 13 Dec 2023 18:34:03 +0100 -Subject: arm64: dts: qcom: sm8150: fix USB SS wakeup - -From: Johan Hovold - -commit cc4e1da491b84ca05339a19893884cda78f74aef upstream. - -The USB SS 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. - -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-6-johan+linaro@kernel.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi -@@ -3629,7 +3629,7 @@ - assigned-clock-rates = <19200000>, <200000000>; - - interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc 6 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 8 IRQ_TYPE_EDGE_BOTH>, - <&pdc 9 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "hs_phy_irq", "ss_phy_irq", -@@ -3678,7 +3678,7 @@ - assigned-clock-rates = <19200000>, <200000000>; - - interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc 7 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 10 IRQ_TYPE_EDGE_BOTH>, - <&pdc 11 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "hs_phy_irq", "ss_phy_irq", diff --git a/queue-6.1/series b/queue-6.1/series index 5c01591acc4..aad86670b46 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -37,7 +37,6 @@ arm64-dts-qcom-sm8150-fix-usb-wakeup-interrupt-types.patch arm64-dts-qcom-sc7280-fix-usb_1-wakeup-interrupt-types.patch arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch -arm64-dts-qcom-sm8150-fix-usb-ss-wakeup.patch lsm-new-security_file_ioctl_compat-hook.patch docs-kernel_abi.py-fix-command-injection.patch scripts-get_abi-fix-source-path-leak.patch