p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: tlv320aic32x4: Restructure set_dai_sysclk 

The sysclk is now managed by the CCF.  Change this function
to merely find the system clock and set it using
clk_set_rate.

Signed-off-by: Annaliese McDermond <nh6z@nh6z.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Annaliese McDermond 2019-03-21 17:58:52 -07:00 committed by Mark Brown
parent 96c3bb0023
commit aa6a60f7be
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/tlv320aic32x4.c
View File

@ -49,7 +49,6 @@
struct aic32x4_priv { struct aic32x4_priv {
struct regmap *regmap; struct regmap *regmap;
u32 sysclk;
u32 power_cfg; u32 power_cfg;
u32 micpga_routing; u32 micpga_routing;
bool swapdacs; bool swapdacs;
@ -567,17 +566,13 @@ static int aic32x4_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_component *component = codec_dai->component; struct snd_soc_component *component = codec_dai->component;
struct aic32x4_priv *aic32x4 = snd_soc_component_get_drvdata(component); struct clk *mclk;
struct clk *pll;
switch (freq) { pll = devm_clk_get(component->dev, "pll");
case 12000000: mclk = clk_get_parent(pll);
case 24000000:
case 25000000: return clk_set_rate(mclk, freq);
aic32x4->sysclk = freq;
return 0;
}
printk(KERN_ERR "aic32x4: invalid frequency to set DAI system clock\n");
return -EINVAL;
} }
static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)