drop clk patch from 6.10 and 6.6

diff --git a/queue-6.10/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch b/queue-6.10/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch
deleted file mode 100644 (file)
index ea32318..0000000
--- a/queue-6.10/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 85e8ee59dfde1a7b847fbed0778391392cd985cb Mon Sep 17 00:00:00 2001
-From: Satya Priya Kakitapalli <quic_skakitap@quicinc.com>
-Date: Wed, 31 Jul 2024 11:59:11 +0530
-Subject: clk: qcom: clk-alpha-pll: Fix zonda set_rate failure when PLL is disabled
-
-From: Satya Priya Kakitapalli <quic_skakitap@quicinc.com>
-
-commit 85e8ee59dfde1a7b847fbed0778391392cd985cb upstream.
-
-Currently, clk_zonda_pll_set_rate polls for the PLL to lock even if the
-PLL is disabled. However, if the PLL is disabled then LOCK_DET will
-never assert and we'll return an error. There is no reason to poll
-LOCK_DET if the PLL is already disabled, so skip polling in this case.
-
-Fixes: f21b6bfecc27 ("clk: qcom: clk-alpha-pll: add support for zonda pll")
-Cc: stable@vger.kernel.org
-Signed-off-by: Satya Priya Kakitapalli <quic_skakitap@quicinc.com>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20240731062916.2680823-4-quic_skakitap@quicinc.com
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/clk/qcom/clk-alpha-pll.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/clk/qcom/clk-alpha-pll.c
-+++ b/drivers/clk/qcom/clk-alpha-pll.c
-@@ -2089,6 +2089,9 @@ static int clk_zonda_pll_set_rate(struct
-       regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a);
-       regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l);
- 
-+      if (!clk_hw_is_enabled(hw))
-+              return 0;
-+
-       /* Wait before polling for the frequency latch */
-       udelay(5);
- 

diff --git a/queue-6.10/series b/queue-6.10/series
index 1ce76fb06f553fa08298268a4576b801b18f5f6d..6d8059aa69a94f522ce6fab0d1b47a6061a094e1 100644 (file)
--- a/queue-6.10/series
+++ b/queue-6.10/series
@@ -46,7 +46,6 @@ parisc-delay-write-protection-until-mark_rodata_ro-call.patch
 clk-starfive-jh7110-sys-add-notifier-for-pll0-clock.patch
 clk-qcom-clk-alpha-pll-fix-the-pll-post-div-mask.patch
 clk-qcom-clk-alpha-pll-fix-the-trion-pll-postdiv-set-rate-api.patch
-clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch
 pinctrl-qcom-x1e80100-bypass-pdc-wakeup-parent-for-now.patch
 can-mcp251x-fix-deadlock-if-an-interrupt-occurs-during-mcp251x_open.patch
 mm-vmalloc-optimize-vmap_lazy_nr-arithmetic-when-purging-each-vmap_area.patch

diff --git a/queue-6.6/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch b/queue-6.6/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch
deleted file mode 100644 (file)
index 968415f..0000000
--- a/queue-6.6/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 85e8ee59dfde1a7b847fbed0778391392cd985cb Mon Sep 17 00:00:00 2001
-From: Satya Priya Kakitapalli <quic_skakitap@quicinc.com>
-Date: Wed, 31 Jul 2024 11:59:11 +0530
-Subject: clk: qcom: clk-alpha-pll: Fix zonda set_rate failure when PLL is disabled
-
-From: Satya Priya Kakitapalli <quic_skakitap@quicinc.com>
-
-commit 85e8ee59dfde1a7b847fbed0778391392cd985cb upstream.
-
-Currently, clk_zonda_pll_set_rate polls for the PLL to lock even if the
-PLL is disabled. However, if the PLL is disabled then LOCK_DET will
-never assert and we'll return an error. There is no reason to poll
-LOCK_DET if the PLL is already disabled, so skip polling in this case.
-
-Fixes: f21b6bfecc27 ("clk: qcom: clk-alpha-pll: add support for zonda pll")
-Cc: stable@vger.kernel.org
-Signed-off-by: Satya Priya Kakitapalli <quic_skakitap@quicinc.com>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20240731062916.2680823-4-quic_skakitap@quicinc.com
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/clk/qcom/clk-alpha-pll.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/clk/qcom/clk-alpha-pll.c
-+++ b/drivers/clk/qcom/clk-alpha-pll.c
-@@ -2062,6 +2062,9 @@ static int clk_zonda_pll_set_rate(struct
-       regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a);
-       regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l);
- 
-+      if (!clk_hw_is_enabled(hw))
-+              return 0;
-+
-       /* Wait before polling for the frequency latch */
-       udelay(5);
- 

diff --git a/queue-6.6/series b/queue-6.6/series
index a3fcbc2810ac41f1f29c9218246291f5d46d2146..3e3ce63403f70318e589bb42b0e2ebf99772f260 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -32,7 +32,6 @@ fuse-fix-memory-leak-in-fuse_create_open.patch
 clk-starfive-jh7110-sys-add-notifier-for-pll0-clock.patch
 clk-qcom-clk-alpha-pll-fix-the-pll-post-div-mask.patch
 clk-qcom-clk-alpha-pll-fix-the-trion-pll-postdiv-set-rate-api.patch
-clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch
 can-mcp251x-fix-deadlock-if-an-interrupt-occurs-during-mcp251x_open.patch
 kexec_file-fix-elfcorehdr-digest-exclusion-when-config_crash_hotplug-y.patch
 mm-vmalloc-ensure-vmap_block-is-initialised-before-adding-to-queue.patch