[openwrt/openwrt] mediatek: don't break auxadc without 32k clk

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 18 12:09:45 PDT 2022


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b00640bd062e3f496f349c05218dabf5cafcd8e2

commit b00640bd062e3f496f349c05218dabf5cafcd8e2
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Sun Oct 16 19:35:50 2022 +0100

    mediatek: don't break auxadc without 32k clk
    
    Make the newly added 32k clock optional for the auxadc driver also used
    on pre-filogic platforms.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../patches-5.15/501-auxadc-add-auxadc-32k-clk.patch         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/target/linux/mediatek/patches-5.15/501-auxadc-add-auxadc-32k-clk.patch b/target/linux/mediatek/patches-5.15/501-auxadc-add-auxadc-32k-clk.patch
index a49fbca4ee..5b98235ff4 100644
--- a/target/linux/mediatek/patches-5.15/501-auxadc-add-auxadc-32k-clk.patch
+++ b/target/linux/mediatek/patches-5.15/501-auxadc-add-auxadc-32k-clk.patch
@@ -8,14 +8,16 @@
  	struct mutex lock;
  	const struct mtk_auxadc_compatible *dev_comp;
  };
-@@ -222,6 +223,12 @@ static int __maybe_unused mt6577_auxadc_
+@@ -222,6 +223,14 @@ static int __maybe_unused mt6577_auxadc_
  		return ret;
  	}
  
-+	ret = clk_prepare_enable(adc_dev->adc_32k_clk);
-+	if (ret) {
-+		pr_err("failed to enable auxadc clock\n");
-+		return ret;
++	if (!IS_ERR(adc_dev->adc_32k_clk)) {
++		ret = clk_prepare_enable(adc_dev->adc_32k_clk);
++		if (ret) {
++			pr_err("failed to enable auxadc clock\n");
++			return ret;
++		}
 +	}
 +
  	mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,




More information about the lede-commits mailing list