genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-09-05 22:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENGR00119077 dac mux should not affect power and clocks

Browse Source 
Changes such that DAC Mux will only affect whether the headphone
output gets connected to the DAC or Line in.

The previous implementation of the DAC Mux allowed the dapm power
level of the sgtl5000 to be affected whether audio was playing or
not.  It also controlled the an internal osc which had no effect
since it didn't affect whether mclk was turned on.

Signed-off-by: Alan Tull <r80115@freescale.com>
This commit is contained in:
Alan Tull
2010-04-26 07:02:27 -05:00
committed by Matt Sealey
parent 440435c73b
commit eb912bbb1f
1 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
sound/soc/codecs/sgtl5000.c
View File

@@ -200,39 +200,6 @@ static void dump_reg(struct snd_soc_codec *codec)
}
#endif
static int dac_mux_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct snd_soc_codec *codec = widget->codec;
unsigned int reg;
if (ucontrol->value.enumerated.item[0]) {
reg = sgtl5000_read(codec, SGTL5000_CHIP_CLK_TOP_CTRL);
reg |= SGTL5000_INT_OSC_EN;
sgtl5000_write(codec, SGTL5000_CHIP_CLK_TOP_CTRL, reg);
if (codec->bias_level != SND_SOC_BIAS_ON) {
sgtl5000_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
sgtl5000_set_bias_level(codec, SND_SOC_BIAS_ON);
} else
snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
reg = sgtl5000_read(codec, SGTL5000_CHIP_ANA_CTRL);
reg &= ~(SGTL5000_LINE_OUT_MUTE | SGTL5000_HP_MUTE);
sgtl5000_write(codec, SGTL5000_CHIP_ANA_CTRL, reg);
} else {
reg = sgtl5000_read(codec, SGTL5000_CHIP_CLK_TOP_CTRL);
reg &= ~SGTL5000_INT_OSC_EN;
sgtl5000_write(codec, SGTL5000_CHIP_CLK_TOP_CTRL, reg);
snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
sgtl5000_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
}
return 0;
}
static const char *adc_mux_text[] = {
"MIC_IN", "LINE_IN"
};
@@ -250,16 +217,8 @@ SOC_ENUM_SINGLE(SGTL5000_CHIP_ANA_CTRL, 6, 2, dac_mux_text);
static const struct snd_kcontrol_new adc_mux =
SOC_DAPM_ENUM("ADC Mux", adc_enum);
static const struct snd_kcontrol_new dac_mux = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "DAC Mux",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE
| SNDRV_CTL_ELEM_ACCESS_VOLATILE,
.info = snd_soc_info_enum_double,
.get = snd_soc_dapm_get_enum_double,
.put = dac_mux_put,
.private_value = (unsigned long)&dac_enum,
};
static const struct snd_kcontrol_new dac_mux =
SOC_DAPM_ENUM("DAC Mux", dac_enum);
static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = {
SND_SOC_DAPM_INPUT("LINE_IN"),