From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751802AbdJRQIS (ORCPT ); Wed, 18 Oct 2017 12:08:18 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:51104 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751723AbdJRQIO (ORCPT ); Wed, 18 Oct 2017 12:08:14 -0400 X-Google-Smtp-Source: ABhQp+T73a1E4w7xLzo4BmFx5bfhP/3BKCjyNVLaq7lr9YQnHk/Ya6rPc5U/6grQFz06+lh6mEQRIg== From: Carlo Caione To: linux@endlessm.com, pierre-louis.bossart@linux.intel.com, lgirdwood@gmail.com, broonie@kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Carlo Caione Subject: [PATCH 2/2] ASoC: intel: byt: Introduce new custom IN2 map Date: Wed, 18 Oct 2017 17:07:59 +0100 Message-Id: <20171018160759.18563-3-carlo@caione.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171018160759.18563-1-carlo@caione.org> References: <20171018160759.18563-1-carlo@caione.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Carlo Caione Introduce a new custom dapm routes map to quirk platforms with the internal mic connected to IN2P. Signed-off-by: Carlo Caione --- sound/soc/intel/boards/bytcr_rt5651.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index ec84454a232d..a8a9c83dfcc0 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -47,7 +47,6 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { {"ssp2 Rx", NULL, "AIF1 Capture"}, {"Headset Mic", NULL, "micbias1"}, /* lowercase for rt5651 */ - {"IN2P", NULL, "Headset Mic"}, {"Headphone", NULL, "HPOL"}, {"Headphone", NULL, "HPOR"}, {"Speaker", NULL, "LOUTL"}, @@ -55,22 +54,32 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { }; static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic1_map[] = { + {"IN2P", NULL, "Headset Mic"}, {"DMIC1", NULL, "Internal Mic"}, }; static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic2_map[] = { + {"IN2P", NULL, "Headset Mic"}, {"DMIC2", NULL, "Internal Mic"}, }; static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { {"Internal Mic", NULL, "micbias1"}, {"IN1P", NULL, "Internal Mic"}, + {"IN2P", NULL, "Headset Mic"}, +}; + +static const struct snd_soc_dapm_route byt_rt5651_intmic_in2_map[] = { + {"Internal Mic", NULL, "micbias1"}, + {"IN2P", NULL, "Internal Mic"}, + {"IN1P", NULL, "Headset Mic"}, }; enum { BYT_RT5651_DMIC1_MAP, BYT_RT5651_DMIC2_MAP, BYT_RT5651_IN1_MAP, + BYT_RT5651_IN2_MAP, }; #define BYT_RT5651_MAP(quirk) ((quirk) & 0xff) @@ -133,6 +142,10 @@ 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_IN2_MAP: + custom_map = byt_rt5651_intmic_in2_map; + num_routes = ARRAY_SIZE(byt_rt5651_intmic_in2_map); + break; case BYT_RT5651_DMIC2_MAP: custom_map = byt_rt5651_intmic_dmic2_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic2_map); -- 2.14.2