ASoc: Intel: boards: fix dapm map of nau88l25_ssm4567 machine
authorFang, Yang A <yang.a.fang@intel.com>
Fri, 11 Dec 2015 19:29:09 +0000 (11:29 -0800)
committerMark Brown <broonie@kernel.org>
Fri, 18 Dec 2015 08:29:02 +0000 (08:29 +0000)
The DAPM map for DMIC and SSP was not properly done, so fix that up.
Also mark machine as fully routed

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/skl_nau88l25_ssm4567.c

index 65c65d4c422c69d814605357a3af140ba4d3f5fa..9c9ebb8d07342aaf0a8a48fbdf109c987032a843 100644 (file)
@@ -108,22 +108,22 @@ static const struct snd_soc_dapm_route skylake_map[] = {
 
        /* other jacks */
        {"MIC", NULL, "Headset Mic"},
-       {"DMIC AIF", NULL, "SoC DMIC"},
+       {"DMic", NULL, "SoC DMIC"},
 
        /* CODEC BE connections */
        { "Left Playback", NULL, "ssp0 Tx"},
        { "Right Playback", NULL, "ssp0 Tx"},
        { "ssp0 Tx", NULL, "codec0_out"},
 
-       { "AIF1 Playback", NULL, "ssp1 Tx"},
+       { "Playback", NULL, "ssp1 Tx"},
        { "ssp1 Tx", NULL, "codec1_out"},
 
        { "codec0_in", NULL, "ssp1 Rx" },
-       { "ssp1 Rx", NULL, "AIF1 Capture" },
+       { "ssp1 Rx", NULL, "Capture" },
 
        /* DMIC */
        { "dmic01_hifi", NULL, "DMIC01 Rx" },
-       { "DMIC01 Rx", NULL, "Capture" },
+       { "DMIC01 Rx", NULL, "DMIC AIF" },
        { "Headphone Jack", NULL, "Platform Clock" },
        { "Headset Mic", NULL, "Platform Clock" },
 };
@@ -336,6 +336,7 @@ static struct snd_soc_card skylake_audio_card = {
        .num_dapm_routes = ARRAY_SIZE(skylake_map),
        .codec_conf = ssm4567_codec_conf,
        .num_configs = ARRAY_SIZE(ssm4567_codec_conf),
+       .fully_routed = true,
 };
 
 static int skylake_audio_probe(struct platform_device *pdev)