From c347d6b3fa7b7df8f1c7a3114bc1d37f60365ed2 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 28 Jan 2024 10:10:30 -0500 Subject: [PATCH] Drop arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch from older trees --- ...64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch | 44 ------------------- queue-5.10/series | 1 - ...64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch | 44 ------------------- queue-5.15/series | 1 - ...64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch | 44 ------------------- queue-5.4/series | 1 - ...64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch | 44 ------------------- queue-6.1/series | 1 - 8 files changed, 180 deletions(-) delete mode 100644 queue-5.10/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch delete mode 100644 queue-5.15/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch delete mode 100644 queue-5.4/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch delete mode 100644 queue-6.1/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch diff --git a/queue-5.10/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch b/queue-5.10/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch deleted file mode 100644 index a883e2620d5..00000000000 --- a/queue-5.10/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 971f5d8b0618d09db75184ddd8cca0767514db5d Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Wed, 13 Dec 2023 18:34:01 +0100 -Subject: arm64: dts: qcom: sdm845: fix USB SS wakeup - -From: Johan Hovold - -commit 971f5d8b0618d09db75184ddd8cca0767514db5d 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: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") -Cc: stable@vger.kernel.org # 4.20 -Signed-off-by: Johan Hovold -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20231213173403.29544-4-johan+linaro@kernel.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -3566,7 +3566,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 6 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", -@@ -3614,7 +3614,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 7 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", diff --git a/queue-5.10/series b/queue-5.10/series index df6bb8e5e12..74ec799cbf0 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -26,7 +26,6 @@ async-split-async_schedule_node_domain.patch async-introduce-async_schedule_dev_nocall.patch arm64-dts-qcom-sdm845-fix-usb-wakeup-interrupt-types.patch arm64-dts-qcom-sdm845-fix-usb-dp-dm-hs-phy-interrupts.patch -arm64-dts-qcom-sdm845-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-5.15/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch b/queue-5.15/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch deleted file mode 100644 index 1a69c5d7063..00000000000 --- a/queue-5.15/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 971f5d8b0618d09db75184ddd8cca0767514db5d Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Wed, 13 Dec 2023 18:34:01 +0100 -Subject: arm64: dts: qcom: sdm845: fix USB SS wakeup - -From: Johan Hovold - -commit 971f5d8b0618d09db75184ddd8cca0767514db5d 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: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") -Cc: stable@vger.kernel.org # 4.20 -Signed-off-by: Johan Hovold -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20231213173403.29544-4-johan+linaro@kernel.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -3768,7 +3768,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 6 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", -@@ -3816,7 +3816,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 7 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", diff --git a/queue-5.15/series b/queue-5.15/series index 3ffec32e5cb..da351e1ded3 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -29,7 +29,6 @@ arm64-dts-qcom-sc7180-fix-usb-wakeup-interrupt-types.patch 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-sdm845-fix-usb-ss-wakeup.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 diff --git a/queue-5.4/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch b/queue-5.4/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch deleted file mode 100644 index 0076a6b9afa..00000000000 --- a/queue-5.4/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 971f5d8b0618d09db75184ddd8cca0767514db5d Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Wed, 13 Dec 2023 18:34:01 +0100 -Subject: arm64: dts: qcom: sdm845: fix USB SS wakeup - -From: Johan Hovold - -commit 971f5d8b0618d09db75184ddd8cca0767514db5d 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: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") -Cc: stable@vger.kernel.org # 4.20 -Signed-off-by: Johan Hovold -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20231213173403.29544-4-johan+linaro@kernel.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -2502,7 +2502,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 6 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", -@@ -2546,7 +2546,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 7 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", diff --git a/queue-5.4/series b/queue-5.4/series index 02d06224d25..29c31b7884e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -14,7 +14,6 @@ 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 -arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.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 diff --git a/queue-6.1/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch b/queue-6.1/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch deleted file mode 100644 index 1371ca62b1f..00000000000 --- a/queue-6.1/arm64-dts-qcom-sdm845-fix-usb-ss-wakeup.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 971f5d8b0618d09db75184ddd8cca0767514db5d Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Wed, 13 Dec 2023 18:34:01 +0100 -Subject: arm64: dts: qcom: sdm845: fix USB SS wakeup - -From: Johan Hovold - -commit 971f5d8b0618d09db75184ddd8cca0767514db5d 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: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") -Cc: stable@vger.kernel.org # 4.20 -Signed-off-by: Johan Hovold -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20231213173403.29544-4-johan+linaro@kernel.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -4049,7 +4049,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 6 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", -@@ -4100,7 +4100,7 @@ - assigned-clock-rates = <19200000>, <150000000>; - - interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, -- <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, -+ <&pdc_intc 7 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", diff --git a/queue-6.1/series b/queue-6.1/series index 00eb9a1c4e8..5c01591acc4 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -36,7 +36,6 @@ arm64-dts-qcom-sdm845-fix-usb-wakeup-interrupt-types.patch 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-sdm845-fix-usb-ss-wakeup.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 -- 2.47.3