diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-09-07 15:06:59 -0700 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-10-14 09:57:02 +0800 |
| commit | d58931a349410e06ba2974fad8e6f949a5a6f278 (patch) | |
| tree | 044ca8236096d100cff3169ac459ade41cb3064f | |
| parent | a88ca92dc386164167d76737af713d1a080f9582 (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>
| -rw-r--r-- | arch/arm/mach-mx5/devices.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c index dd5a9515838..652d23a83d4 100644 --- a/arch/arm/mach-mx5/devices.c +++ b/arch/arm/mach-mx5/devices.c @@ -120,7 +120,7 @@ static struct resource usbotg_xcvr_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_USB_OTG, + .start = MX51_INT_USB_OTG, .flags = IORESOURCE_IRQ, }, }; diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 7e4066e131e..c2395e43b1a 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -182,16 +182,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"), @@ -212,7 +212,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", |