mediatek: switch to Linux version 6.1

[openwrt/staging/dangole.git] / target / linux / mediatek / patches-5.15 / 350-15-cpufreq-mediatek-Handle-sram-regulator-probe-deferra.patch

diff --git a/target/linux/mediatek/patches-5.15/350-15-cpufreq-mediatek-Handle-sram-regulator-probe-deferra.patch b/target/linux/mediatek/patches-5.15/350-15-cpufreq-mediatek-Handle-sram-regulator-probe-deferra.patch
deleted file mode 100644 (file)
index c013789..0000000
--- a/target/linux/mediatek/patches-5.15/350-15-cpufreq-mediatek-Handle-sram-regulator-probe-deferra.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 75d19b24aa3203d6c78e4c431c2cc07157ce12fe Mon Sep 17 00:00:00 2001
-From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Date: Wed, 13 Jul 2022 13:15:36 +0200
-Subject: [PATCH 15/21] cpufreq: mediatek: Handle sram regulator probe deferral
-
-If the regulator_get_optional() call for the SRAM regulator returns
-a probe deferral, we must bail out and retry probing later: failing
-to do this will produce unstabilities on platforms requiring the
-handling for this regulator.
-
-Fixes: ffa7bdf7f344 ("cpufreq: mediatek: Make sram regulator optional")
-Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
----
- drivers/cpufreq/mediatek-cpufreq.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/cpufreq/mediatek-cpufreq.c
-+++ b/drivers/cpufreq/mediatek-cpufreq.c
-@@ -439,9 +439,13 @@ static int mtk_cpu_dvfs_info_init(struct
- 
-       /* Both presence and absence of sram regulator are valid cases. */
-       info->sram_reg = regulator_get_optional(cpu_dev, "sram");
--      if (IS_ERR(info->sram_reg))
-+      if (IS_ERR(info->sram_reg)) {
-+              ret = PTR_ERR(info->sram_reg);
-+              if (ret == -EPROBE_DEFER)
-+                      goto out_free_resources;
-+
-               info->sram_reg = NULL;
--      else {
-+      } else {
-               ret = regulator_enable(info->sram_reg);
-               if (ret) {
-                       dev_warn(cpu_dev, "cpu%d: failed to enable vsram\n", cpu);