Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/mtk', 'asoc/topic...

[cascardo/linux.git] / sound / soc / intel / boards / skl_nau88l25_ssm4567.c

diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
index a75c093..5f1ca99 100644 (file)
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
@@ -132,6 +132,8 @@ static const struct snd_soc_dapm_route skylake_map[] = {
 
        /* IV feedback path */
        { "codec0_lp_in", NULL, "ssp0 Rx"},
+       { "ssp0 Rx", NULL, "Left Capture Sense" },
+       { "ssp0 Rx", NULL, "Right Capture Sense" },
 
        { "Playback", NULL, "ssp1 Tx"},
        { "ssp1 Tx", NULL, "codec1_out"},
@@ -154,14 +156,6 @@ static const struct snd_soc_dapm_route skylake_map[] = {
        { "Headset Mic", NULL, "Platform Clock" },
 };
 
-static const struct snd_soc_pcm_stream skl_ssm4567_loop_params = {
-       .formats = SNDRV_PCM_FMTBIT_S24_LE,
-       .rate_min = 48000,
-       .rate_max = 48000,
-       .channels_min = 4,
-       .channels_max = 4,
-};
-
 static struct snd_soc_codec_conf ssm4567_codec_conf[] = {
        {
                .dev_name = "i2c-INT343B:00",
@@ -506,16 +500,6 @@ static struct snd_soc_dai_link skylake_dais[] = {
                .nonatomic = 1,
                .dynamic = 1,
        },
-       /* Codec-codec link */
-       {
-               .name = "Skylake IV loop",
-               .stream_name = "SKL IV Loop",
-               .cpu_dai_name = "SSP0 Pin",
-               .platform_name = "0000:00:1f.3",
-               .codecs = ssm4567_codec_components,
-               .num_codecs = ARRAY_SIZE(ssm4567_codec_components),
-               .params = &skl_ssm4567_loop_params,
-       },
 
        /* Back End DAI links */
        {
@@ -534,6 +518,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
                .ignore_pmdown_time = 1,
                .be_hw_params_fixup = skylake_ssp_fixup,
                .dpcm_playback = 1,
+               .dpcm_capture = 1,
        },
        {
                /* SSP1 - Codec */