diff options
author | Ramalingam C <ramalingamc@nvidia.com> | 2012-03-21 18:34:38 +0530 |
---|---|---|
committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-03-22 04:01:36 -0700 |
commit | 809402ac1ccaacb788d40f15fb4a3e28c60775b4 (patch) | |
tree | 0ba7aeae55b95fc14d9fec8ef938cf61c0b3f2ac | |
parent | ea168e22b7c0b2ca0f6c74f15aa3714f6a72b82f (diff) |
ASoC: Tegra WM8903 machine: Fix to control name conflict
This change resolves the control name (Line Out Switch) conflict between
wm8903 codec driver and tegra machine driver.
Bug 956506
Change-Id: Iab049c7fb2fdde0d481d07d8e1bbdbeea1a831d9
Signed-off-by: Ramalingam C <ramalingamc@nvidia.com>
Reviewed-on: http://git-master/r/91510
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
-rw-r--r-- | sound/soc/tegra/tegra_wm8903.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index a75d67b2d973..24f69e40f7d2 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -487,7 +487,7 @@ static int tegra_wm8903_event_ext_mic(struct snd_soc_dapm_widget *w, static const struct snd_soc_dapm_widget cardhu_dapm_widgets[] = { SND_SOC_DAPM_SPK("Int Spk", tegra_wm8903_event_int_spk), SND_SOC_DAPM_HP("Headphone Jack", tegra_wm8903_event_hp), - SND_SOC_DAPM_LINE("Line Out", NULL), + SND_SOC_DAPM_LINE("LineOut", NULL), SND_SOC_DAPM_MIC("Mic Jack", tegra_wm8903_event_ext_mic), SND_SOC_DAPM_MIC("Int Mic", tegra_wm8903_event_int_mic), SND_SOC_DAPM_LINE("Line In", NULL), @@ -517,8 +517,8 @@ static const struct snd_soc_dapm_route cardhu_audio_map[] = { {"Int Spk", NULL, "RON"}, {"Int Spk", NULL, "LOP"}, {"Int Spk", NULL, "LON"}, - {"Line Out", NULL, "LINEOUTL"}, - {"Line Out", NULL, "LINEOUTR"}, + {"LineOut", NULL, "LINEOUTL"}, + {"LineOut", NULL, "LINEOUTR"}, {"Mic Bias", NULL, "Mic Jack"}, {"IN1L", NULL, "Mic Bias"}, {"Mic Bias", NULL, "Int Mic"}, @@ -562,7 +562,7 @@ static const struct snd_soc_dapm_route aebl_audio_map[] = { static const struct snd_kcontrol_new cardhu_controls[] = { SOC_DAPM_PIN_SWITCH("Int Spk"), SOC_DAPM_PIN_SWITCH("Headphone Jack"), - SOC_DAPM_PIN_SWITCH("Line Out"), + SOC_DAPM_PIN_SWITCH("LineOut"), SOC_DAPM_PIN_SWITCH("Mic Jack"), SOC_DAPM_PIN_SWITCH("Int Mic"), SOC_DAPM_PIN_SWITCH("Line In"), |