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 (file)
index 3ec8920..0000000
--- 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 <johan+linaro@kernel.org>
-Date: Wed, 13 Dec 2023 18:34:03 +0100
-Subject: arm64: dts: qcom: sm8150: fix USB SS wakeup
-
-From: Johan Hovold <johan+linaro@kernel.org>
-
-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 <quic_jackp@quicinc.com>
-Cc: Jonathan Marek <jonathan@marek.ca>
-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-6-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/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 f7ef070625015f49367576c621f3b81068f021ae..7d09d68af2f5b444466833d594008155cba5fec6 100644 (file)
--- 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 (file)
index b6df9cd..0000000
--- 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 <johan+linaro@kernel.org>
-Date: Wed, 13 Dec 2023 18:34:03 +0100
-Subject: arm64: dts: qcom: sm8150: fix USB SS wakeup
-
-From: Johan Hovold <johan+linaro@kernel.org>
-
-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 <quic_jackp@quicinc.com>
-Cc: Jonathan Marek <jonathan@marek.ca>
-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-6-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/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 5c01591acc4371435cdc165b595ec5497906a529..aad86670b4632d95620e49848b8ada8477639dfd 100644 (file)
--- 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