diff options
| author |   Mark Brown <broonie@kernel.org> | 2017-01-31 20:03:10 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-31 20:03:10 +0000 |
| commit | 39d75485689de9abd2b27e9b2771c48db8e4be23 (patch) | |
| tree | cc6bc3f2644eec817c71c1d4222054f0b62ae7e6 /sound/soc/intel/boards/bytcr_rt5640.c | |
| parent | ASoC: Intel: Atom: Configure media_loop1 and sprot_loop in stereo (diff) | |
| parent | ASoC: Intel: atom: fix frame polarity (diff) | |
| download | linux-dev-39d75485689de9abd2b27e9b2771c48db8e4be23.tar.xz linux-dev-39d75485689de9abd2b27e9b2771c48db8e4be23.zip | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/boards/bytcr_rt5640.c')
| -rw-r--r-- | sound/soc/intel/boards/bytcr_rt5640.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 613e5286555a..744e5eab2298 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -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, SND_SOC_DAIFMT_I2S | - SND_SOC_DAIFMT_NB_IF | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS ); 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, SND_SOC_DAIFMT_I2S | - SND_SOC_DAIFMT_NB_IF | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS ); 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 = { .driver = { .name = "bytcr_rt5640", - .pm = &snd_soc_pm_ops, }, .probe = snd_byt_rt5640_mc_probe, }; |