ASoC: bf5xx-ssm2602: Set DAI format
PATCH 1/2 ASoC: bf5xx-ssm2602: Set DAI format
Commit 980b0bc69 ("ASoC: blackfin: Use dai_fmt") converted the blackfin ASoC machine drivers to use the dai_links dai_fmt field to setup their DAI format. For the bf5xx-ssm2602 the commit removed the manual call to snd_soc_dai_set_fmt, but missed to set the dai_links dai_fmt field.
---
The commit that introduced the problem is only in 3.4-rc
--- sound/soc/blackfin/bf5xx-ssm2602.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/blackfin/bf5xx-ssm2602.c +2 -0
@@ -99,6 +99,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { .platform_name = "bfin-i2s-pcm-audio", .codec_name = "ssm2602.0-001b", .ops = &bf5xx_ssm2602_ops, + .dai_fmt = BF5XX_SSM2602_DAIFMT, }, { .name = "ssm2602",
@@ -108,6 +109,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { .platform_name = "bfin-i2s-pcm-audio", .codec_name = "ssm2602.0-001b", .ops = &bf5xx_ssm2602_ops, + .dai_fmt = BF5XX_SSM2602_DAIFMT, }, };
Signature · 1 line
1.7.9.5
PATCH 2/2 ASoC: bf5xx-ssm2602: Setup sysclock in init callback
The sysclock is fixed, so just set it up once in the init callback instead of setting it repeatably in the hw_params callback.
--- sound/soc/blackfin/bf5xx-ssm2602.c | 37 ++++-------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-)
sound/soc/blackfin/bf5xx-ssm2602.c +4 -33
@@ -44,16 +44,8 @@static struct snd_soc_card bf5xx_ssm2602; -static int bf5xx_ssm2602_hw_params (struct snd_pcm_substream *substream, -struct snd_pcm_hw_params *params) +static int bf5xx_ssm2602_init (struct snd_soc_pcm_runtime *rtd) { -struct snd_soc_pcm_runtime *rtd = substream->private_data; -struct snd_soc_dai *codec_dai = rtd->codec_dai; -unsigned int clk =0 ; -int ret =0 ; - -pr_debug ("%s rate %d format %x\n" , __func__,params_rate (params), -params_format (params));/* * If you are using a crystal source which frequency is not 12MHz * then modify the below case statement with frequency of the crystal.
@@ -61,31 +53,10 @@ static int bf5xx_ssm2602_hw_params(struct snd_pcm_substream *substream,* If you are using the SPORT to generate clocking then this is * where to do it. */ - -switch (params_rate (params)) { -case 8000 : -case 16000 : -case 48000 : -case 96000 : -case 11025 : -case 22050 : -case 44100 : - clk =12000000 ; -break ; - } - - ret =snd_soc_dai_set_sysclk (codec_dai,SSM2602_SYSCLK , clk, +return snd_soc_dai_set_sysclk (rtd->codec_dai,SSM2602_SYSCLK ,12000000 ,SND_SOC_CLOCK_IN ); -if (ret <0 ) -return ret; - -return 0 ; } -static struct snd_soc_ops bf5xx_ssm2602_ops = { - .hw_params = bf5xx_ssm2602_hw_params, -}; -/* CODEC is master for BCLK and LRC in this configuration. */ #define BF5XX_SSM2602_DAIFMT (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \ SND_SOC_DAIFMT_CBM_CFM)
@@ -98,7 +69,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { .codec_dai_name = "ssm2602-hifi", .platform_name = "bfin-i2s-pcm-audio", .codec_name = "ssm2602.0-001b", - .ops = &bf5xx_ssm2602_ops, + .init = bf5xx_ssm2602_init, .dai_fmt = BF5XX_SSM2602_DAIFMT, }, {
@@ -108,7 +79,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { .codec_dai_name = "ssm2602-hifi", .platform_name = "bfin-i2s-pcm-audio", .codec_name = "ssm2602.0-001b", - .ops = &bf5xx_ssm2602_ops, + .init = bf5xx_ssm2602_init, .dai_fmt = BF5XX_SSM2602_DAIFMT, }, };
Signature · 1 line
1.7.9.5
Mark Brown
AppliedQuoted 4 lines · Lars-Peter Clausen
Commit
980b0bc69("ASoC: blackfin: Usedai_fmt") converted the blackfin ASoC machine drivers to use thedai_linksdai_fmtfield to setup their DAI format. For the bf5xx-ssm2602 the commit removed the manual call tosnd_soc_dai_set_fmt, but missed to set thedai_linksdai_fmtfield.
Applied, thanks.