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

ASoC: tlv320aic32x4: Move aosr and dosr setting to separate functions



Move these to separate helper functions.  This looks cleaner and fits
better with the new clock setting in CCF.

Signed-off-by: default avatarAnnaliese McDermond <nh6z@nh6z.net>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d25970b5
Loading
Loading
Loading
Loading
+17 −7
Original line number Diff line number Diff line
@@ -718,6 +718,20 @@ static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
	return 0;
}

static int aic32x4_set_aosr(struct snd_soc_component *component, u8 aosr)
{
	return snd_soc_component_write(component, AIC32X4_AOSR, aosr);
}

static int aic32x4_set_dosr(struct snd_soc_component *component, u16 dosr)
{
	snd_soc_component_write(component, AIC32X4_DOSRMSB, dosr >> 8);
	snd_soc_component_write(component, AIC32X4_DOSRLSB,
		      (dosr & 0xff));

	return 0;
}

static int aic32x4_set_processing_blocks(struct snd_soc_component *component,
						u8 r_block, u8 p_block)
{
@@ -763,14 +777,10 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component,
	clk_set_rate(clocks[4].clk, aic32x4_divs[i].mdac_rate);
	clk_set_rate(clocks[5].clk, aic32x4_divs[i].bdiv_rate);

	aic32x4_set_processing_blocks(component, aic32x4_divs[i].r_block, aic32x4_divs[i].p_block);
	aic32x4_set_aosr(component, aic32x4_divs[i].aosr);
	aic32x4_set_dosr(component, aic32x4_divs[i].dosr);

	/* DOSR MSB & LSB values */
	snd_soc_component_write(component, AIC32X4_DOSRMSB, aic32x4_divs[i].dosr >> 8);
	snd_soc_component_write(component, AIC32X4_DOSRLSB, (aic32x4_divs[i].dosr & 0xff));

	/* AOSR value */
	snd_soc_component_write(component, AIC32X4_AOSR, aic32x4_divs[i].aosr);
	aic32x4_set_processing_blocks(component, aic32x4_divs[i].r_block, aic32x4_divs[i].p_block);

	return 0;
}