Drop cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch-28374

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch-28374 b/queue-5.15/cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch-28374
deleted file mode 100644 (file)
index 9538e21..0000000
--- a/queue-5.15/cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch-28374
+++ /dev/null
@@ -1,93 +0,0 @@
-From f0041e826bf3e7cd2dd219b3c2c9ac0326946ac2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 12 May 2023 17:07:11 +0200
-Subject: cpufreq: imx6q: don't warn for disabling a non-existing frequency
-
-From: Christoph Niedermaier <cniedermaier@dh-electronics.com>
-
-[ Upstream commit 11a3b0ac33d95aa84be426e801f800997262a225 ]
-
-It is confusing if a warning is given for disabling a non-existent
-frequency of the operating performance points (OPP). In this case
-the function dev_pm_opp_disable() returns -ENODEV. Check the return
-value and avoid the output of a warning in this case. Avoid code
-duplication by using a separate function.
-
-Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
-[ Viresh : Updated commit subject ]
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Stable-dep-of: 2e4e0984c7d6 ("cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpufreq/imx6q-cpufreq.c | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
-index 90beb26ed34e9..37d30fa2df5fa 100644
---- a/drivers/cpufreq/imx6q-cpufreq.c
-+++ b/drivers/cpufreq/imx6q-cpufreq.c
-@@ -209,6 +209,14 @@ static struct cpufreq_driver imx6q_cpufreq_driver = {
-       .suspend = cpufreq_generic_suspend,
- };
- 
-+static void imx6x_disable_freq_in_opp(struct device *dev, unsigned long freq)
-+{
-+      int ret = dev_pm_opp_disable(dev, freq);
-+
-+      if (ret < 0 && ret != -ENODEV)
-+              dev_warn(dev, "failed to disable %ldMHz OPP\n", freq / 1000000);
-+}
-+
- #define OCOTP_CFG3                    0x440
- #define OCOTP_CFG3_SPEED_SHIFT                16
- #define OCOTP_CFG3_SPEED_1P2GHZ               0x3
-@@ -254,17 +262,15 @@ static int imx6q_opp_check_speed_grading(struct device *dev)
-       val &= 0x3;
- 
-       if (val < OCOTP_CFG3_SPEED_996MHZ)
--              if (dev_pm_opp_disable(dev, 996000000))
--                      dev_warn(dev, "failed to disable 996MHz OPP\n");
-+              imx6x_disable_freq_in_opp(dev, 996000000);
- 
-       if (of_machine_is_compatible("fsl,imx6q") ||
-           of_machine_is_compatible("fsl,imx6qp")) {
-               if (val != OCOTP_CFG3_SPEED_852MHZ)
--                      if (dev_pm_opp_disable(dev, 852000000))
--                              dev_warn(dev, "failed to disable 852MHz OPP\n");
-+                      imx6x_disable_freq_in_opp(dev, 852000000);
-+
-               if (val != OCOTP_CFG3_SPEED_1P2GHZ)
--                      if (dev_pm_opp_disable(dev, 1200000000))
--                              dev_warn(dev, "failed to disable 1.2GHz OPP\n");
-+                      imx6x_disable_freq_in_opp(dev, 1200000000);
-       }
- 
-       return 0;
-@@ -316,20 +322,16 @@ static int imx6ul_opp_check_speed_grading(struct device *dev)
-       val >>= OCOTP_CFG3_SPEED_SHIFT;
-       val &= 0x3;
- 
--      if (of_machine_is_compatible("fsl,imx6ul")) {
-+      if (of_machine_is_compatible("fsl,imx6ul"))
-               if (val != OCOTP_CFG3_6UL_SPEED_696MHZ)
--                      if (dev_pm_opp_disable(dev, 696000000))
--                              dev_warn(dev, "failed to disable 696MHz OPP\n");
--      }
-+                      imx6x_disable_freq_in_opp(dev, 696000000);
- 
-       if (of_machine_is_compatible("fsl,imx6ull")) {
-               if (val != OCOTP_CFG3_6ULL_SPEED_792MHZ)
--                      if (dev_pm_opp_disable(dev, 792000000))
--                              dev_warn(dev, "failed to disable 792MHz OPP\n");
-+                      imx6x_disable_freq_in_opp(dev, 792000000);
- 
-               if (val != OCOTP_CFG3_6ULL_SPEED_900MHZ)
--                      if (dev_pm_opp_disable(dev, 900000000))
--                              dev_warn(dev, "failed to disable 900MHz OPP\n");
-+                      imx6x_disable_freq_in_opp(dev, 900000000);
-       }
- 
-       return ret;
--- 
-2.42.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index a967b6042060dc61b24cf918c8032badb8af2c8f..3069de3779062e22a39d95d8f0674c90f1d41f83 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch
 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch
 iommu-vt-d-make-context-clearing-consistent-with-con.patch
 smb3-fix-touch-h-of-symlink.patch-27885
-cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch-28374
 cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745
 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch-28521
 iommu-vt-d-make-context-clearing-consistent-with-con.patch-18873