OSDN Git Service

ASoC: Intel: kbl: Add DAI links for Multi-Playback & Echo-reference
authorNaveen Manohar <naveen.m@intel.com>
Wed, 2 Aug 2017 06:13:34 +0000 (11:43 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 3 Aug 2017 10:07:05 +0000 (11:07 +0100)
Add new FE DAI links to support:
1. Parallel playback on 2 ports simultaneously
2. Echo reference capture capability

Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/kbl_rt5663_max98927.c
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

index 090331b..4c70d5a 100644 (file)
@@ -52,6 +52,8 @@ struct kbl_rt5663_private {
 enum {
        KBL_DPCM_AUDIO_PB = 0,
        KBL_DPCM_AUDIO_CP,
+       KBL_DPCM_AUDIO_HS_PB,
+       KBL_DPCM_AUDIO_ECHO_REF_CP,
        KBL_DPCM_AUDIO_REF_CP,
        KBL_DPCM_AUDIO_DMIC_CP,
        KBL_DPCM_AUDIO_HDMI1_PB,
@@ -485,6 +487,28 @@ static struct snd_soc_dai_link kabylake_dais[] = {
                .dpcm_capture = 1,
                .ops = &kabylake_rt5663_fe_ops,
        },
+       [KBL_DPCM_AUDIO_HS_PB] = {
+               .name = "Kbl Audio Headset Playback",
+               .stream_name = "Headset Audio",
+               .cpu_dai_name = "System Pin2",
+               .codec_name = "snd-soc-dummy",
+               .codec_dai_name = "snd-soc-dummy-dai",
+               .platform_name = "0000:00:1f.3",
+               .dpcm_playback = 1,
+               .nonatomic = 1,
+               .dynamic = 1,
+       },
+       [KBL_DPCM_AUDIO_ECHO_REF_CP] = {
+               .name = "Kbl Audio Echo Reference cap",
+               .stream_name = "Echoreference Capture",
+               .cpu_dai_name = "Echoref Pin",
+               .codec_name = "snd-soc-dummy",
+               .codec_dai_name = "snd-soc-dummy-dai",
+               .platform_name = "0000:00:1f.3",
+               .init = NULL,
+               .capture_only = 1,
+               .nonatomic = 1,
+       },
        [KBL_DPCM_AUDIO_REF_CP] = {
                .name = "Kbl Audio Reference cap",
                .stream_name = "Wake on Voice",
index 74bbc00..64364de 100644 (file)
@@ -62,6 +62,8 @@ struct kbl_codec_private {
 enum {
        KBL_DPCM_AUDIO_PB = 0,
        KBL_DPCM_AUDIO_CP,
+       KBL_DPCM_AUDIO_HS_PB,
+       KBL_DPCM_AUDIO_ECHO_REF_CP,
        KBL_DPCM_AUDIO_DMIC_CP,
        KBL_DPCM_AUDIO_HDMI1_PB,
        KBL_DPCM_AUDIO_HDMI2_PB,
@@ -456,6 +458,28 @@ static struct snd_soc_dai_link kabylake_dais[] = {
                .dpcm_capture = 1,
                .ops = &kabylake_rt5663_fe_ops,
        },
+       [KBL_DPCM_AUDIO_HS_PB] = {
+               .name = "Kbl Audio Headset Playback",
+               .stream_name = "Headset Audio",
+               .cpu_dai_name = "System Pin2",
+               .codec_name = "snd-soc-dummy",
+               .codec_dai_name = "snd-soc-dummy-dai",
+               .platform_name = "0000:00:1f.3",
+               .dpcm_playback = 1,
+               .nonatomic = 1,
+               .dynamic = 1,
+       },
+       [KBL_DPCM_AUDIO_ECHO_REF_CP] = {
+               .name = "Kbl Audio Echo Reference cap",
+               .stream_name = "Echoreference Capture",
+               .cpu_dai_name = "Echoref Pin",
+               .codec_name = "snd-soc-dummy",
+               .codec_dai_name = "snd-soc-dummy-dai",
+               .platform_name = "0000:00:1f.3",
+               .init = NULL,
+               .capture_only = 1,
+               .nonatomic = 1,
+       },
        [KBL_DPCM_AUDIO_DMIC_CP] = {
                .name = "Kbl Audio DMIC cap",
                .stream_name = "dmiccap",