ASoC: twl6040: Use consistent names for Handsfree path

Use "Handsfree XYZ" for user visible controls, while the internal DAPM
widgets can use "HF XYZ".
In this way we can group the Handsfree related controls in UI
(alsamixer for example).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 3450b11fa7dd067edc479d12d06c131159c0a0f2..10f292dc1fa99d9eb845a2e1dc5cc98511df7a52 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1158,9 +1158,9 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
                        twl6040_power_mode_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",
@@ -1172,11 +1172,11 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
                        &ep_path_enable_control),
 
        /* Analog playback drivers */
-       SND_SOC_DAPM_OUT_DRV_E("Handsfree Left Driver",
+       SND_SOC_DAPM_OUT_DRV_E("HF Left Driver",
                        TWL6040_REG_HFLCTL, 4, 0, NULL, 0,
                        pga_event,
                        SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
-       SND_SOC_DAPM_OUT_DRV_E("Handsfree Right Driver",
+       SND_SOC_DAPM_OUT_DRV_E("HF Right Driver",
                        TWL6040_REG_HFRCTL, 4, 0, NULL, 0,
                        pga_event,
                        SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -1194,9 +1194,9 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
                        SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
 
        /* Analog playback PGAs */
-       SND_SOC_DAPM_PGA("HFDAC Left PGA",
+       SND_SOC_DAPM_PGA("HF Left PGA",
                        TWL6040_REG_HFLCTL, 1, 0, NULL, 0),
-       SND_SOC_DAPM_PGA("HFDAC Right PGA",
+       SND_SOC_DAPM_PGA("HF Right PGA",
                        TWL6040_REG_HFRCTL, 1, 0, NULL, 0),
 
 };
@@ -1238,20 +1238,20 @@ static const struct snd_soc_dapm_route intercon[] = {
        {"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"},
+       {"HF Left PGA", NULL, "Handsfree Left Playback"},
+       {"HF Right PGA", NULL, "Handsfree Right Playback"},
 
-       {"Handsfree Left Driver", "Switch", "HFDAC Left PGA"},
-       {"Handsfree Right Driver", "Switch", "HFDAC Right PGA"},
+       {"HF Left Driver", NULL, "HF Left PGA"},
+       {"HF Right Driver", NULL, "HF Right PGA"},
 
-       {"HFL", NULL, "Handsfree Left Driver"},
-       {"HFR", NULL, "Handsfree Right Driver"},
+       {"HFL", NULL, "HF Left Driver"},
+       {"HFR", NULL, "HF Right Driver"},
 };
 
 static int twl6040_add_widgets(struct snd_soc_codec *codec)