2019-09-04 17:01:23 +00:00
|
|
|
From ac6dec39e076d1b7e9883b6d99c6e20f31122cf1 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Annaliese McDermond <nh6z@nh6z.net>
|
|
|
|
|
Date: Thu, 21 Mar 2019 17:58:53 -0700
|
2019-09-04 17:01:23 +00:00
|
|
|
Subject: [PATCH 407/782] ASoC: tlv320aic32x4: Remove mclk references
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
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 | 7 -------
|
|
|
|
|
1 file changed, 7 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/sound/soc/codecs/tlv320aic32x4.c
|
|
|
|
|
+++ b/sound/soc/codecs/tlv320aic32x4.c
|
|
|
|
|
@@ -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, st
|
|
|
|
|
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;
|
