]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: Intel: bytcr-rt5651: fix capture routes
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 8 Sep 2017 17:43:53 +0000 (12:43 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 19 Sep 2017 13:36:23 +0000 (14:36 +0100)
There is only one dmic path and the routes were not added.
Probably a copy-paste mistake when initially creating the
file

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/bytcr_rt5651.c

index 4a3516b38c2c9727f7138054cee367ab5ede1205..441f735a198fec9d7cf696a6ddd51e75e290b1cf 100644 (file)
@@ -54,12 +54,9 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = {
        {"Speaker", NULL, "LOUTR"},
 };
 
-static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic1_map[] = {
-       {"DMIC1", NULL, "Internal Mic"},
-};
-
-static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic2_map[] = {
-       {"DMIC2", NULL, "Internal Mic"},
+static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = {
+       {"DMIC L1", NULL, "Internal Mic"},
+       {"DMIC R1", NULL, "Internal Mic"},
 };
 
 static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = {
@@ -133,14 +130,13 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
                custom_map = byt_rt5651_intmic_in1_map;
                num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_map);
                break;
-       case BYT_RT5651_DMIC2_MAP:
-               custom_map = byt_rt5651_intmic_dmic2_map;
-               num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic2_map);
-               break;
        default:
-               custom_map = byt_rt5651_intmic_dmic1_map;
-               num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic1_map);
+               custom_map = byt_rt5651_intmic_dmic_map;
+               num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map);
        }
+       ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes);
+       if (ret)
+               return ret;
 
        ret = snd_soc_add_card_controls(card, byt_rt5651_controls,
                                        ARRAY_SIZE(byt_rt5651_controls));