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

Commit 73f40dc1 authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files

[ALSA] soc - ASoC 0.13 Sharp poodle machine 



This patch updates the Sharp poodle machine driver to the new API in
ASoC 0.13.
Changes:-
o  Manually configure DAI hardware format.
o Removed config_sysclk() function. No longer needed as clocking is now
configured manually.

Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent cb4c048b

sound/soc/pxa/poodle.c

+53 −30
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include "../codecs/wm8731.h"

#include "pxa2xx-pcm.h"

#include "pxa2xx-i2s.h"



#define POODLE_HP        1

#define POODLE_HP_OFF    0
@@ -100,8 +101,59 @@ static int poodle_shutdown(struct snd_pcm_substream *substream) 
	return 0;

}



static int poodle_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;

	struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;

	unsigned int clk = 0;

	int ret = 0;



	switch (params_rate(params)) {

	case 8000:

	case 16000:

	case 48000:

	case 96000:

		clk = 12288000;

		break;

	case 11025:

	case 22050:

	case 44100:

		clk = 11289600;

		break;

	}



	/* set codec DAI configuration */

	ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = cpu_dai->dai_ops.set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set the codec system clock for DAC and ADC */

	ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8731_SYSCLK, clk,

		SND_SOC_CLOCK_IN);

	if (ret < 0)

		return ret;



	/* set the I2S system clock as input (unused) */

	ret = cpu_dai->dai_ops.set_sysclk(cpu_dai, PXA2XX_I2S_SYSCLK, 0,

		SND_SOC_CLOCK_IN);

	if (ret < 0)

		return ret;



	return 0;

}



static struct snd_soc_ops poodle_ops = {

	.startup = poodle_startup,

	.hw_params = poodle_hw_params,

	.shutdown = poodle_shutdown,

};
@@ -225,34 +277,6 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec) 
	return 0;

}



static unsigned int poodle_config_sysclk(struct snd_soc_pcm_runtime *rtd,

	struct snd_soc_clock_info *info)

{

	if (info->bclk_master & SND_SOC_DAIFMT_CBS_CFS) {

		/* pxa2xx is i2s master  */

		switch (info->rate) {

		case 44100:

		case 88200:

			/* configure codec digital filters for 44.1, 88.2 */

			rtd->codec_dai->config_sysclk(rtd->codec_dai, info,

				11289600);

		break;

		default:

			/* configure codec digital filters for all other rates */

			rtd->codec_dai->config_sysclk(rtd->codec_dai, info,

				POODLE_AUDIO_CLOCK);

		break;

		}

		return rtd->cpu_dai->config_sysclk(rtd->cpu_dai, info,

			POODLE_AUDIO_CLOCK);

	} else {

		/* codec is i2s master -

		 * only configure codec DAI clock and filters */

		return rtd->codec_dai->config_sysclk(rtd->codec_dai, info,

			POODLE_AUDIO_CLOCK);

	}

}



/* poodle digital audio interface glue - connects codec <--> CPU */

static struct snd_soc_dai_link poodle_dai = {

	.name = "WM8731",
@@ -260,7 +284,7 @@ static struct snd_soc_dai_link poodle_dai = { 
	.cpu_dai = &pxa_i2s_dai,

	.codec_dai = &wm8731_dai,

	.init = poodle_wm8731_init,

	.config_sysclk = poodle_config_sysclk,

	.ops = &poodle_ops,

};



/* poodle audio machine driver */
@@ -268,7 +292,6 @@ static struct snd_soc_machine snd_soc_machine_poodle = { 
	.name = "Poodle",

	.dai_link = &poodle_dai,

	.num_links = 1,

	.ops = &poodle_ops,

};



/* poodle audio private data */