diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-05-14 17:20:54 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-14 16:57:27 +0100 |
| commit | 49fee17816347c401be0dfcf98ee9fc131f25f10 (patch) | |
| tree | 3a575a775bfc6e2cd2bfacde170a355209c1d936 /sound/soc/intel/byt-rt5640.c | |
| parent | 3a46c7b7cc09ace471f9ccb4d11950fb2f7f2d96 (diff) | |
| download | op-kernel-dev-49fee17816347c401be0dfcf98ee9fc131f25f10.zip op-kernel-dev-49fee17816347c401be0dfcf98ee9fc131f25f10.tar.gz | |
ASoC: Intel: Only export one Baytrail DAI
We don't need more than one DAI for Baytrail SST. Usage becomes also more
straightforward by grouping playback and capture streams under the same PCM
device.
[Jarkko: I made Liam's sst-baytrail-pcm.c change a few lines smaller and
squashed together with my byt-rt5640.c change]
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel/byt-rt5640.c')
| -rw-r--r-- | sound/soc/intel/byt-rt5640.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c index 9061616..dbc63d0 100644 --- a/sound/soc/intel/byt-rt5640.c +++ b/sound/soc/intel/byt-rt5640.c @@ -117,7 +117,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { { .name = "Baytrail Audio", .stream_name = "Audio", - .cpu_dai_name = "Front-cpu-dai", + .cpu_dai_name = "baytrail-pcm-audio", .codec_dai_name = "rt5640-aif1", .codec_name = "i2c-10EC5640:00", .platform_name = "baytrail-pcm-audio", @@ -126,18 +126,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .init = byt_rt5640_init, .ops = &byt_rt5640_ops, }, - { - .name = "Baytrail Voice", - .stream_name = "Voice", - .cpu_dai_name = "Mic1-cpu-dai", - .codec_dai_name = "rt5640-aif1", - .codec_name = "i2c-10EC5640:00", - .platform_name = "baytrail-pcm-audio", - .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS, - .init = NULL, - .ops = &byt_rt5640_ops, - }, }; static struct snd_soc_card byt_rt5640_card = { |
