diff options
| author | Naveen Kumar S <nkumars@nvidia.com> | 2014-04-09 17:11:03 +0530 |
|---|---|---|
| committer | Seema Khowala <seemaj@nvidia.com> | 2014-04-23 14:05:03 -0700 |
| commit | 05fdf01fa3fb5fa9f398a5ce1c42860aea54c3a4 (patch) | |
| tree | a026b9c3a47451a28f2b152c6170a14125ea9627 /sound | |
| parent | cae4bf801c4d638df9a07e70eb46dc1f6d7ee085 (diff) | |
ASoc: Tegra: max98090: secondary mic only for t14x
Secondary MIC available in tegra14x platforms only. Hence adding
appropriate conditions.
Also, DMIC3 and DMIC4 are declared for max98091 and not max98090.
bug 1457218
Change-Id: Ieeaff6890a195a4620f80b17ea9a9e0a1ff975c9
Signed-off-by: Naveen Kumar S <nkumars@nvidia.com>
Reviewed-on: http://git-master/r/394119
(cherry picked from commit 3964e8be2fa3bc3e406be5e4dccbf980cc97b1fb)
Reviewed-on: http://git-master/r/396361
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_max98090.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index 11bfc4dc5235..f03161d841c2 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c @@ -977,8 +977,10 @@ static const struct snd_soc_dapm_route tegra_max98090_audio_map[] = { {"IN56", NULL, "MICBIAS"}, {"DMICL", NULL, "DMic Pri"}, {"DMICR", NULL, "DMic Pri"}, +#ifdef CONFIG_ARCH_TEGRA_14x_SOC {"DMIC3", NULL, "DMic Sec"}, {"DMIC4", NULL, "DMic Sec"}, +#endif }; static const struct snd_kcontrol_new tegra_max98090_controls[] = { @@ -989,7 +991,9 @@ static const struct snd_kcontrol_new tegra_max98090_controls[] = { SOC_DAPM_PIN_SWITCH("Int Mic"), SOC_DAPM_PIN_SWITCH("Ext Mic"), SOC_DAPM_PIN_SWITCH("DMic Pri"), +#ifdef CONFIG_ARCH_TEGRA_14x_SOC SOC_DAPM_PIN_SWITCH("DMic Sec"), +#endif }; static int tegra_max98090_init(struct snd_soc_pcm_runtime *rtd) |