diff options
| author | Pierre Moos <p-moos@ti.com> | 2012-01-27 16:55:56 +0100 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-12-04 00:35:49 +0100 |
| commit | f02eef1b91d78584701ceda1868951b2600b8e69 (patch) | |
| tree | d5e36caa62269b957fca5a32147667aea2c76acf | |
| parent | 08f35d542eed2be07d247d8e95f86a84c1795e7d (diff) | |
| download | kernel_samsung_tuna-f02eef1b91d78584701ceda1868951b2600b8e69.zip kernel_samsung_tuna-f02eef1b91d78584701ceda1868951b2600b8e69.tar.gz kernel_samsung_tuna-f02eef1b91d78584701ceda1868951b2600b8e69.tar.bz2 | |
ASoC: twl6040: Align widget names with Kernel V3.1
Change-Id: I77acb512c8d8bd703d10cdfab4397d5ffdbb2fb6
Signed-off-by: Pierre Moos <p-moos@ti.com>
Signed-off-by: Francois Mazard <f-mazard@ti.com>
Conflicts:
sound/soc/codecs/twl6040.c
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index fdf4438..e8afb79 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1313,14 +1313,14 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { twl6040_hf_dac_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), - SND_SOC_DAPM_MUX("HF Left Playback", + SND_SOC_DAPM_MUX("Handsfree Left Playback", SND_SOC_NOPM, 0, 0, &hfl_mux_controls), - SND_SOC_DAPM_MUX("HF Right Playback", + SND_SOC_DAPM_MUX("Handsfree Right Playback", SND_SOC_NOPM, 0, 0, &hfr_mux_controls), /* Analog playback Muxes */ - SND_SOC_DAPM_MUX("HS Left Playback", + SND_SOC_DAPM_MUX("Headset Left Playback", SND_SOC_NOPM, 0, 0, &hsl_mux_controls), - SND_SOC_DAPM_MUX("HS Right Playback", + SND_SOC_DAPM_MUX("Headset Right Playback", SND_SOC_NOPM, 0, 0, &hsr_mux_controls), /* Analog playback drivers */ @@ -1340,7 +1340,7 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { TWL6040_REG_HSRCTL, 2, 0, NULL, 0, pga_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), - SND_SOC_DAPM_SWITCH("Earphone Enable", + SND_SOC_DAPM_SWITCH("Earphone Playback", SND_SOC_NOPM, 0, 0, &ep_driver_switch_controls), SND_SOC_DAPM_SUPPLY("Earphone Power Mode", SND_SOC_NOPM, 0, 0, twl6040_ep_mode_event, @@ -1378,32 +1378,32 @@ static const struct snd_soc_dapm_route intercon[] = { {"AFMAmpL", "NULL", "AFML"}, {"AFMAmpR", "NULL", "AFMR"}, - {"HS Left Playback", "HS DAC", "HSDAC Left"}, - {"HS Left Playback", "Line-In amp", "AFMAmpL"}, + {"Headset Left Playback", "HS DAC", "HSDAC Left"}, + {"Headset Left Playback", "Line-In amp", "AFMAmpL"}, - {"HS Right Playback", "HS DAC", "HSDAC Right"}, - {"HS Right Playback", "Line-In amp", "AFMAmpR"}, + {"Headset Right Playback", "HS DAC", "HSDAC Right"}, + {"Headset Right Playback", "Line-In amp", "AFMAmpR"}, - {"Headset Left Driver", "NULL", "HS Left Playback"}, - {"Headset Right Driver", "NULL", "HS Right Playback"}, + {"Headset Left Driver", "NULL", "Headset Left Playback"}, + {"Headset Right Driver", "NULL", "Headset Right Playback"}, {"HSOL", NULL, "Headset Left Driver"}, {"HSOR", NULL, "Headset Right Driver"}, /* Earphone playback path */ - {"Earphone Enable", "Switch", "HSDAC Left"}, - {"Earphone Enable", NULL, "Earphone Power Mode"}, - {"Earphone Driver", NULL, "Earphone Enable"}, + {"Earphone Playback", "Switch", "HSDAC Left"}, + {"Earphone Playback", NULL, "Earphone Power Mode"}, + {"Earphone Driver", NULL, "Earphone Playback"}, {"EP", NULL, "Earphone Driver"}, - {"HF Left Playback", "HF DAC", "HFDAC Left"}, - {"HF Left Playback", "Line-In amp", "AFMAmpL"}, + {"Handsfree Left Playback", "HF DAC", "HFDAC Left"}, + {"Handsfree Left Playback", "Line-In amp", "AFMAmpL"}, - {"HF Right Playback", "HF DAC", "HFDAC Right"}, - {"HF Right Playback", "Line-In amp", "AFMAmpR"}, + {"Handsfree Right Playback", "HF DAC", "HFDAC Right"}, + {"Handsfree Right Playback", "Line-In amp", "AFMAmpR"}, - {"HFDAC Left PGA", NULL, "HF Left Playback"}, - {"HFDAC Right PGA", NULL, "HF Right Playback"}, + {"HFDAC Left PGA", NULL, "Handsfree Left Playback"}, + {"HFDAC Right PGA", NULL, "Handsfree Right Playback"}, {"Handsfree Left Driver", "Switch", "HFDAC Left PGA"}, {"Handsfree Right Driver", "Switch", "HFDAC Right PGA"}, |