iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Intel: load hw_defaults in hw_params of ssp be

Browse Source 
We have the SSP defaults now and we need to load then in hw_params callback
of BE SSP DAI ops.

Signed-off-by: Praveen Diwakar <praveen.diwakar@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Vinod Koul 2015-05-06 22:06:42 +05:30 committed by Mark Brown
parent 5749d70edc
commit 711bc9476b
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/intel/atom/sst-atom-controls.h
View File

@ -869,4 +869,6 @@ struct sst_enum {
SOC_DAPM_ENUM(SST_MUX_CTL_NAME(xpname, xinstance), \ SOC_DAPM_ENUM(SST_MUX_CTL_NAME(xpname, xinstance), \
SST_SSP_MUX_ENUM(xreg, xshift, xtexts)) SST_SSP_MUX_ENUM(xreg, xshift, xtexts))
void sst_fill_ssp_defaults(struct snd_soc_dai *dai);
#endif #endif

16
sound/soc/intel/atom/sst-mfld-platform-pcm.c
View File

@ -434,13 +434,22 @@ static int sst_enable_ssp(struct snd_pcm_substream *substream,
if (!dai->active) { if (!dai->active) {
ret = sst_handle_vb_timer(dai, true); ret = sst_handle_vb_timer(dai, true);
if (ret) sst_fill_ssp_defaults(dai);
return ret;
ret = send_ssp_cmd(dai, dai->name, 1);
} }
return ret; return ret;
} }
static int sst_be_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
{
int ret = 0;
if (dai->active == 1)
ret = send_ssp_cmd(dai, dai->name, 1);
return ret;
}
static void sst_disable_ssp(struct snd_pcm_substream *substream, static void sst_disable_ssp(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
@ -465,6 +474,7 @@ static struct snd_soc_dai_ops sst_compr_dai_ops = {
static struct snd_soc_dai_ops sst_be_dai_ops = { static struct snd_soc_dai_ops sst_be_dai_ops = {
.startup = sst_enable_ssp, .startup = sst_enable_ssp,
.hw_params = sst_be_hw_params,
.shutdown = sst_disable_ssp, .shutdown = sst_disable_ssp,
}; };