[alsa-devel] [PATCH] ASoC: DaVinci: Updates to EVM hardware params callback
For S/PDIF transciever codec to work on TI DM6467 EVM, the codec ops pointer should be checked for in the params callback. This dummy codec has no set_fmt or set_sysclk implementations.
Tested on TI DM6467 EVM.
Signed-off-by: Chaithrika U S chaithrika@ti.com Tested-by: Anuj Aggarwal anuj.aggarwal@ti.com --- Applies to ALSA GIT tree on branch topic/asoc at http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=shortlog; h=topic/asoc
sound/soc/davinci/davinci-evm.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 7ccbe66..1760354 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -64,9 +64,11 @@ static int evm_hw_params(struct snd_pcm_substream *substream, return -EINVAL;
/* set codec DAI configuration */ - ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT); - if (ret < 0) - return ret; + if (codec_dai->ops->set_fmt) { + ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT); + if (ret < 0) + return ret; + }
/* set cpu DAI configuration */ ret = snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT); @@ -74,9 +76,12 @@ static int evm_hw_params(struct snd_pcm_substream *substream, return ret;
/* set the codec system clock */ - ret = snd_soc_dai_set_sysclk(codec_dai, 0, sysclk, SND_SOC_CLOCK_OUT); - if (ret < 0) - return ret; + if (codec_dai->ops->set_sysclk) { + ret = snd_soc_dai_set_sysclk(codec_dai, 0, sysclk, + SND_SOC_CLOCK_OUT); + if (ret < 0) + return ret; + }
return 0; }
On Wed, Jan 20, 2010 at 05:02:41PM +0530, Chaithrika U S wrote:
@@ -64,9 +64,11 @@ static int evm_hw_params(struct snd_pcm_substream *substream, return -EINVAL;
/* set codec DAI configuration */
- ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);
- if (ret < 0)
return ret;
- if (codec_dai->ops->set_fmt) {
ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);
if (ret < 0)
return ret;
- }
It would be better to have separate hw_params() functions for separate links rather than do things like this. There's a strong expectation that the board driver knows exactly what CODEC it's talking to and how to configure it so code like this looks odd.
participants (2)
-
Chaithrika U S
-
Mark Brown