diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-09-07 15:06:59 -0700 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-11-10 11:20:33 +0800 |
| commit | 331e4ef4f156aa2bfbec5e0079ed6f6f6f552129 (patch) | |
| tree | b96bb8c209f62d14d014ee9f230c4cc618478ac3 /sound | |
| parent | 1088540bc765614051916294db6ba40c2b90043c (diff) | |
ASoC: sgtl5000: rename dac_mux to hp_mux
The DAC mux is actually a mux selection for the headphone output.
Renaming it to hp_mux will make this clearer.
Signed-off-by: Eric Miao <eric.miao@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d15695d1c27..a72039cc5c2 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -180,16 +180,16 @@ SOC_ENUM_SINGLE(SGTL5000_CHIP_ANA_CTRL, 2, 2, adc_mux_text); static const struct snd_kcontrol_new adc_mux = SOC_DAPM_ENUM("Capture Mux", adc_enum); -/* input sources for DAC */ -static const char *dac_mux_text[] = { +/* input sources for Headphone */ +static const char *hp_mux_text[] = { "DAC", "LINE_IN" }; -static const struct soc_enum dac_enum = -SOC_ENUM_SINGLE(SGTL5000_CHIP_ANA_CTRL, 6, 2, dac_mux_text); +static const struct soc_enum hp_mux_enum = +SOC_ENUM_SINGLE(SGTL5000_CHIP_ANA_CTRL, 6, 2, hp_mux_text); -static const struct snd_kcontrol_new dac_mux = -SOC_DAPM_ENUM("Headphone Mux", dac_enum); +static const struct snd_kcontrol_new hp_mux = +SOC_DAPM_ENUM("Headphone Mux", hp_mux_enum); static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { SND_SOC_DAPM_INPUT("LINE_IN"), @@ -210,7 +210,7 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux), - SND_SOC_DAPM_MUX("Headphone Mux", SND_SOC_NOPM, 0, 0, &dac_mux), + SND_SOC_DAPM_MUX("Headphone Mux", SND_SOC_NOPM, 0, 0, &hp_mux), /* aif for i2s input */ SND_SOC_DAPM_AIF_IN("AIFIN", "Playback", |