ASoC: byt-rt5640: Register microphone routes with the card DAPM context

Board level DAPM elements should be registered with the card's DAPM context
rather than the CODEC's DAPM context.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index a51856e9182652ddd5ac64c39f64c2e0769bd687..354eaad886e1c09619b0d1e2f1269b9ef715aa3a 100644 (file)
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -132,7 +132,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
 {
        int ret;
        struct snd_soc_codec *codec = runtime->codec;
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
        struct snd_soc_card *card = runtime->card;
        const struct snd_soc_dapm_route *custom_map;
        int num_routes;
@@ -161,7 +160,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
                num_routes = ARRAY_SIZE(byt_rt5640_intmic_dmic1_map);
        }
 
-       ret = snd_soc_dapm_add_routes(dapm, custom_map, num_routes);
+       ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes);
        if (ret)
                return ret;