ALSA: cs5535audio: drop ec_analog_input flag for OLPC stuff
This is no longer necessary, as we're no longer doing indexed i/o commands. Signed-off-by: Andres Salomon <dilinger@debian.org>
This commit is contained in:
parent
3556d18465
commit
b91254e75c
|
@ -92,9 +92,6 @@ struct cs5535audio {
|
||||||
struct snd_pcm_substream *playback_substream;
|
struct snd_pcm_substream *playback_substream;
|
||||||
struct snd_pcm_substream *capture_substream;
|
struct snd_pcm_substream *capture_substream;
|
||||||
struct cs5535audio_dma dmas[NUM_CS5535AUDIO_DMAS];
|
struct cs5535audio_dma dmas[NUM_CS5535AUDIO_DMAS];
|
||||||
#ifdef CONFIG_OLPC
|
|
||||||
int ec_analog_input_mode;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
|
|
|
@ -38,8 +38,7 @@ static int snd_cs5535audio_ctl_get(struct snd_kcontrol *kcontrol,
|
||||||
reg1 = snd_ac97_read(cs5535au->ac97, AC97_AD_MISC);
|
reg1 = snd_ac97_read(cs5535au->ac97, AC97_AD_MISC);
|
||||||
reg2 = snd_ac97_read(cs5535au->ac97, AC97_AD_TEST2);
|
reg2 = snd_ac97_read(cs5535au->ac97, AC97_AD_TEST2);
|
||||||
|
|
||||||
if ((reg1 & AD1888_VREFOUT_EN_BIT) && (reg2 & AD1888_HPF_EN_BIT) &&
|
if ((reg1 & AD1888_VREFOUT_EN_BIT) && (reg2 & AD1888_HPF_EN_BIT))
|
||||||
cs5535au->ec_analog_input_mode)
|
|
||||||
ucontrol->value.integer.value[0] = 1;
|
ucontrol->value.integer.value[0] = 1;
|
||||||
else
|
else
|
||||||
ucontrol->value.integer.value[0] = 0;
|
ucontrol->value.integer.value[0] = 0;
|
||||||
|
@ -58,10 +57,6 @@ static int snd_cs5535audio_ctl_put(struct snd_kcontrol *kcontrol,
|
||||||
/* value is 1 if analog input is desired */
|
/* value is 1 if analog input is desired */
|
||||||
value = ucontrol->value.integer.value[0];
|
value = ucontrol->value.integer.value[0];
|
||||||
|
|
||||||
/* use ec mode as flag to determine if any change needed */
|
|
||||||
if (cs5535au->ec_analog_input_mode == value)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* sets High Z on VREF Bias if 1 */
|
/* sets High Z on VREF Bias if 1 */
|
||||||
if (value)
|
if (value)
|
||||||
err = snd_ac97_update_bits(ac97, AC97_AD_MISC,
|
err = snd_ac97_update_bits(ac97, AC97_AD_MISC,
|
||||||
|
@ -88,8 +83,6 @@ static int snd_cs5535audio_ctl_put(struct snd_kcontrol *kcontrol,
|
||||||
else
|
else
|
||||||
geode_gpio_clear(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
|
geode_gpio_clear(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
|
||||||
|
|
||||||
cs5535au->ec_analog_input_mode = value;
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue