Unverified Commit a8e43c21 authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

ASoC: pxa: remove clock divider and pll setup from zylonite and magician 



The SSP DAI now handles the clocking setup itself, all it needs is the
master clock frequency. Remove the code from Zylonite and Magician
platforms.

Signed-off-by: default avatarDaniel Mack <daniel@zonque.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7864a79f

sound/soc/pxa/magician.c

+2 −104
Original line number Diff line number Diff line
@@ -90,95 +90,9 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	unsigned int acps, acds, width;

	unsigned int div4 = PXA_SSP_CLK_SCDB_4;

	unsigned int width;

	int ret = 0;



	width = snd_pcm_format_physical_width(params_format(params));



	/*

	 * rate = SSPSCLK / (2 * width(16 or 32))

	 * SSPSCLK = (ACPS / ACDS) / SSPSCLKDIV(div4 or div1)

	 */

	switch (params_rate(params)) {

	case 8000:

		/* off by a factor of 2: bug in the PXA27x audio clock? */

		acps = 32842000;

		switch (width) {

		case 16:

			/* 513156 Hz ~= _2_ * 8000 Hz * 32 (+0.23%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_16;

			break;

		default: /* 32 */

			/* 1026312 Hz ~= _2_ * 8000 Hz * 64 (+0.23%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_8;

		}

		break;

	case 11025:

		acps = 5622000;

		switch (width) {

		case 16:

			/* 351375 Hz ~= 11025 Hz * 32 (-0.41%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_4;

			break;

		default: /* 32 */

			/* 702750 Hz ~= 11025 Hz * 64 (-0.41%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_2;

		}

		break;

	case 22050:

		acps = 5622000;

		switch (width) {

		case 16:

			/* 702750 Hz ~= 22050 Hz * 32 (-0.41%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_2;

			break;

		default: /* 32 */

			/* 1405500 Hz ~= 22050 Hz * 64 (-0.41%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_1;

		}

		break;

	case 44100:

		acps = 5622000;

		switch (width) {

		case 16:

			/* 1405500 Hz ~= 44100 Hz * 32 (-0.41%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_2;

			break;

		default: /* 32 */

			/* 2811000 Hz ~= 44100 Hz * 64 (-0.41%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_1;

		}

		break;

	case 48000:

		acps = 12235000;

		switch (width) {

		case 16:

			/* 1529375 Hz ~= 48000 Hz * 32 (-0.44%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_2;

			break;

		default: /* 32 */

			/* 3058750 Hz ~= 48000 Hz * 64 (-0.44%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_1;

		}

		break;

	case 96000:

	default:

		acps = 12235000;

		switch (width) {

		case 16:

			/* 3058750 Hz ~= 96000 Hz * 32 (-0.44%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_1;

			break;

		default: /* 32 */

			/* 6117500 Hz ~= 96000 Hz * 64 (-0.44%) */

			acds = PXA_SSP_CLK_AUDIO_DIV_2;

			div4 = PXA_SSP_CLK_SCDB_1;

			break;

		}

		break;

	}



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_MSB |

			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
@@ -191,6 +105,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	width = snd_pcm_format_physical_width(params_format(params));

	ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 0, 1, width);

	if (ret < 0)

		return ret;
@@ -201,23 +116,6 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	/* set the SSP audio system clock ACDS divider */

	ret = snd_soc_dai_set_clkdiv(cpu_dai,

			PXA_SSP_AUDIO_DIV_ACDS, acds);

	if (ret < 0)

		return ret;



	/* set the SSP audio system clock SCDB divider4 */

	ret = snd_soc_dai_set_clkdiv(cpu_dai,

			PXA_SSP_AUDIO_DIV_SCDB, div4);

	if (ret < 0)

		return ret;



	/* set SSP audio pll clock */

	ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, acps);

	if (ret < 0)

		return ret;



	return 0;

}

sound/soc/pxa/zylonite.c

+0 −9
Original line number Diff line number Diff line
@@ -83,11 +83,9 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	unsigned int pll_out = 0;

	unsigned int wm9713_div = 0;

	int ret = 0;

	int rate = params_rate(params);

	int width = snd_pcm_format_physical_width(params_format(params));



	/* Only support ratios that we can generate neatly from the AC97

	 * based master clock - in particular, this excludes 44.1kHz.
@@ -109,17 +107,10 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	/* Add 1 to the width for the leading clock cycle */

	pll_out = rate * (width + 1) * 8;



	ret = snd_soc_dai_set_sysclk(cpu_dai, PXA_SSP_CLK_AUDIO, 0, 1);

	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, pll_out);

	if (ret < 0)

		return ret;



	if (clk_pout)

		ret = snd_soc_dai_set_clkdiv(codec_dai, WM9713_PCMCLK_PLL_DIV,

					     WM9713_PCMDIV(wm9713_div));