Drop another patch from 5.15 and 5.18

diff --git a/queue-5.15/arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch b/queue-5.15/arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch
deleted file mode 100644 (file)
index 9ecf3de..0000000
--- a/queue-5.15/arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a7cc6ff9c34f6fad88091f7ac340f6dab6b4d2e2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 30 Apr 2022 07:51:17 +0200
-Subject: ARM: dts: qcom: replace gcc PXO with pxo_board fixed clock
-
-From: Ansuel Smith <ansuelsmth@gmail.com>
-
-[ Upstream commit eb9e93937756a05787977875830c0dc482cb57e0 ]
-
-Replace gcc PXO phandle to pxo_board fixed clock declared in the dts.
-gcc driver doesn't provide PXO_SRC as it's a fixed-clock. This cause a
-kernel panic if any driver actually try to use it.
-
-Fixes: 40cf5c884a96 ("ARM: dts: qcom: add L2CC and RPM for IPQ8064")
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20220430055118.1947-2-ansuelsmth@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/qcom-ipq8064.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-index 4139d3817bd6..85f906442227 100644
---- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -782,7 +782,7 @@ tcsr: syscon@1a400000 {
-               l2cc: clock-controller@2011000 {
-                       compatible = "qcom,kpss-gcc", "syscon";
-                       reg = <0x2011000 0x1000>;
--                      clocks = <&gcc PLL8_VOTE>, <&gcc PXO_SRC>;
-+                      clocks = <&gcc PLL8_VOTE>, <&pxo_board>;
-                       clock-names = "pll8_vote", "pxo";
-                       clock-output-names = "acpu_l2_aux";
-               };
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 23061559f63c9399c5bea3fdc2e82eb63b1ee2a1..e93299aae0305c95eadafbda72b6d78490da9985 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -187,7 +187,6 @@ arm64-dts-qcom-sdm636-sony-xperia-ganges-mermaid-cor.patch
 cpufreq-zynq-fix-refcount-leak-in-zynq_get_revision.patch
 regulator-qcom_smd-fix-pm8916_pldo-range.patch
 acpi-apei-fix-_einj-vs-efi_memory_sp.patch
-arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch
 arm-dts-qcom-msm8974-fix-irq-type-on-blsp2_uart1.patch
 soc-qcom-ocmem-fix-refcount-leak-in-of_get_ocmem.patch
 soc-qcom-aoss-fix-refcount-leak-in-qmp_cooling_devic.patch

diff --git a/queue-5.18/arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch b/queue-5.18/arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch
deleted file mode 100644 (file)
index 89bf134..0000000
--- a/queue-5.18/arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From cf62880428cadaefb3e9dabe822e80b19571f817 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 30 Apr 2022 07:51:17 +0200
-Subject: ARM: dts: qcom: replace gcc PXO with pxo_board fixed clock
-
-From: Ansuel Smith <ansuelsmth@gmail.com>
-
-[ Upstream commit eb9e93937756a05787977875830c0dc482cb57e0 ]
-
-Replace gcc PXO phandle to pxo_board fixed clock declared in the dts.
-gcc driver doesn't provide PXO_SRC as it's a fixed-clock. This cause a
-kernel panic if any driver actually try to use it.
-
-Fixes: 40cf5c884a96 ("ARM: dts: qcom: add L2CC and RPM for IPQ8064")
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20220430055118.1947-2-ansuelsmth@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/qcom-ipq8064.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-index 8cb04aa8ed2f..326793ae3738 100644
---- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -782,7 +782,7 @@ tcsr: syscon@1a400000 {
-               l2cc: clock-controller@2011000 {
-                       compatible = "qcom,kpss-gcc", "syscon";
-                       reg = <0x2011000 0x1000>;
--                      clocks = <&gcc PLL8_VOTE>, <&gcc PXO_SRC>;
-+                      clocks = <&gcc PLL8_VOTE>, <&pxo_board>;
-                       clock-names = "pll8_vote", "pxo";
-                       clock-output-names = "acpu_l2_aux";
-               };
--- 
-2.35.1
-

diff --git a/queue-5.18/series b/queue-5.18/series
index 3056a654dd6eb9c6e86e3c04367ab06223bf9ab1..a89abb32b57d52d57d3cb31acdde048f5ab79abf 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -222,7 +222,6 @@ arm64-dts-renesas-r8a779m8-drop-operating-points-abo.patch
 arm64-dts-renesas-r9a07g054l2-smarc-correct-soc-name.patch
 regulator-qcom_smd-fix-pm8916_pldo-range.patch
 acpi-apei-fix-_einj-vs-efi_memory_sp.patch
-arm-dts-qcom-replace-gcc-pxo-with-pxo_board-fixed-cl.patch
 arm-dts-qcom-msm8974-lge-nexus5-move-gpio-keys-out-o.patch
 arm-dts-qcom-msm8974-samsung-klte-move-gpio-keys-out.patch
 arm-dts-qcom-do-not-use-underscore-in-node-name.patch