ASoC: tlv320aic32x4: Remove mclk references
authorAnnaliese McDermond <nh6z@nh6z.net>
Fri, 22 Mar 2019 00:58:53 +0000 (17:58 -0700)
committerpopcornmix <popcornmix@gmail.com>
Mon, 13 May 2019 23:08:26 +0000 (00:08 +0100)
commit 78f2d58a289302e56a7def96a783a7686ebf27e2 upstream.

mclk is not used by anything anymore.  Remove support for it.
All that information now comes from the clock tree.

Signed-off-by: Annaliese McDermond <nh6z@nh6z.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/tlv320aic32x4.c

index 1f66b03..06988ef 100644 (file)
@@ -53,7 +53,6 @@ struct aic32x4_priv {
        u32 micpga_routing;
        bool swapdacs;
        int rstn_gpio;
-       struct clk *mclk;
        const char *mclk_name;
 
        struct regulator *supply_ldo;
@@ -1191,12 +1190,6 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap)
                aic32x4->mclk_name = "mclk";
        }
 
-       aic32x4->mclk = devm_clk_get(dev, "mclk");
-       if (IS_ERR(aic32x4->mclk)) {
-               dev_err(dev, "Failed getting the mclk. The current implementation does not support the usage of this codec without mclk\n");
-               return PTR_ERR(aic32x4->mclk);
-       }
-
        ret = aic32x4_register_clocks(dev, aic32x4->mclk_name);
        if (ret)
                return ret;