redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel

Browse source
This commit is contained in:
Mark Brown 2017-01-31 20:03:10 +00:00
parent 5b101ab465 f12f5c84e3
commit 39d7548568
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/intel/atom/sst-atom-controls.c
View file

@ -801,13 +801,11 @@ static int sst_get_frame_sync_polarity(struct snd_soc_dai *dai,
switch (format) { switch (format) {
case SND_SOC_DAIFMT_NB_NF: case SND_SOC_DAIFMT_NB_NF:
return SSP_FS_ACTIVE_LOW;
case SND_SOC_DAIFMT_NB_IF:
return SSP_FS_ACTIVE_HIGH;
case SND_SOC_DAIFMT_IB_IF:
return SSP_FS_ACTIVE_LOW;
case SND_SOC_DAIFMT_IB_NF: case SND_SOC_DAIFMT_IB_NF:
return SSP_FS_ACTIVE_HIGH; return SSP_FS_ACTIVE_HIGH;
case SND_SOC_DAIFMT_NB_IF:
case SND_SOC_DAIFMT_IB_IF:
return SSP_FS_ACTIVE_LOW;
default: default:
dev_err(dai->dev, "Invalid frame sync polarity %d\n", format); dev_err(dai->dev, "Invalid frame sync polarity %d\n", format);
} }

5
sound/soc/intel/boards/bytcr_rt5640.c
View file

@ -556,7 +556,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,
*/ */
ret = snd_soc_dai_set_fmt(rtd->cpu_dai, ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBS_CFS
); );
if (ret < 0) { if (ret < 0) {
@ -582,7 +582,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,
*/ */
ret = snd_soc_dai_set_fmt(rtd->cpu_dai, ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBS_CFS
); );
if (ret < 0) { if (ret < 0) {
@ -856,7 +856,6 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
static struct platform_driver snd_byt_rt5640_mc_driver = { static struct platform_driver snd_byt_rt5640_mc_driver = {
.driver = { .driver = {
.name = "bytcr_rt5640", .name = "bytcr_rt5640",
.pm = &snd_soc_pm_ops,
}, },
.probe = snd_byt_rt5640_mc_probe, .probe = snd_byt_rt5640_mc_probe,
}; };

3
sound/soc/intel/boards/bytcr_rt5651.c
View file

@ -185,7 +185,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd,
*/ */
ret = snd_soc_dai_set_fmt(rtd->cpu_dai, ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBS_CFS
); );
@ -319,7 +319,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
static struct platform_driver snd_byt_rt5651_mc_driver = { static struct platform_driver snd_byt_rt5651_mc_driver = {
.driver = { .driver = {
.name = "bytcr_rt5651", .name = "bytcr_rt5651",
.pm = &snd_soc_pm_ops,
}, },
.probe = snd_byt_rt5651_mc_probe, .probe = snd_byt_rt5651_mc_probe,
}; };