Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit aa6a60f7 authored by Annaliese McDermond's avatar Annaliese McDermond Committed by Mark Brown
Browse files

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: default avatarAnnaliese McDermond <nh6z@nh6z.net>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 96c3bb00

sound/soc/codecs/tlv320aic32x4.c

+6 −11
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 


struct aic32x4_priv {

	struct regmap *regmap;

	u32 sysclk;

	u32 power_cfg;

	u32 micpga_routing;

	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)

{

	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) {

	case 12000000:

	case 24000000:

	case 25000000:

		aic32x4->sysclk = freq;

		return 0;

	}

	printk(KERN_ERR "aic32x4: invalid frequency to set DAI system clock\n");

	return -EINVAL;

	pll = devm_clk_get(component->dev, "pll");

	mclk = clk_get_parent(pll);



	return clk_set_rate(mclk, freq);

}



static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)