]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[ALSA] hda-codec - add support for analog loopback to STAC9204/9205/922x/927x
authorMaxim Levitsky <maximlevitsky@gmail.com>
Mon, 3 Sep 2007 13:29:37 +0000 (15:29 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Oct 2007 13:59:49 +0000 (15:59 +0200)
The analog loopback routes the sound just before it enters ADC0
to output of DAC0.

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/pci/hda/patch_sigmatel.c

index 297f740192798f058a9c4ead92f2e3bcebbecea8..c94775c8a0bfad594c71be4a010fb2631eac7eed 100644 (file)
@@ -147,6 +147,7 @@ struct sigmatel_spec {
        /* i/o switches */
        unsigned int io_switch[2];
        unsigned int clfe_swap;
+       unsigned int aloopback;
 
        struct hda_pcm pcm_rec[2];      /* PCM information */
 
@@ -296,6 +297,49 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
                                     spec->mux_nids[adc_idx], &spec->cur_mux[adc_idx]);
 }
 
+#define stac92xx_aloopback_info snd_ctl_boolean_mono_info
+
+static int stac92xx_aloopback_get(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
+       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct sigmatel_spec *spec = codec->spec;
+
+       ucontrol->value.integer.value[0] = spec->aloopback;
+       return 0;
+}
+
+static int stac92xx_aloopback_put(struct snd_kcontrol *kcontrol,
+               struct snd_ctl_elem_value *ucontrol)
+{
+       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct sigmatel_spec *spec = codec->spec;
+       unsigned int dac_mode;
+
+       if (spec->aloopback == ucontrol->value.integer.value[0])
+               return 0;
+
+       spec->aloopback = ucontrol->value.integer.value[0];
+
+
+       dac_mode = snd_hda_codec_read(codec, codec->afg, 0,
+               kcontrol->private_value & 0xFFFF, 0x0);
+
+       if (spec->aloopback) {
+               snd_hda_power_up(codec);
+               dac_mode |= 0x40;
+       } else {
+               snd_hda_power_down(codec);
+               dac_mode &= ~0x40;
+       }
+
+       snd_hda_codec_write_cache(codec, codec->afg, 0,
+               kcontrol->private_value >> 16, dac_mode);
+
+       return 1;
+}
+
+
 static struct hda_verb stac9200_core_init[] = {
        /* set dac0mux for dac converter */
        { 0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -346,6 +390,17 @@ static struct hda_verb stac9205_core_init[] = {
                .put = stac92xx_mux_enum_put, \
        }
 
+#define STAC_ANALOG_LOOPBACK(verb_read,verb_write) \
+       { \
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+               .name  = "Analog Loopback", \
+               .count = 1, \
+               .info  = stac92xx_aloopback_info, \
+               .get   = stac92xx_aloopback_get, \
+               .put   = stac92xx_aloopback_put, \
+               .private_value = verb_read | (verb_write << 16), \
+       }
+
 
 static struct snd_kcontrol_new stac9200_mixer[] = {
        HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT),
@@ -377,6 +432,7 @@ static struct snd_kcontrol_new stac922x_mixer[] = {
 /* This needs to be generated dynamically based on sequence */
 static struct snd_kcontrol_new stac9227_mixer[] = {
        STAC_INPUT_SOURCE,
+       STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB),
        HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
        HDA_CODEC_MUTE("Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
        { } /* end */
@@ -384,6 +440,7 @@ static struct snd_kcontrol_new stac9227_mixer[] = {
 
 static struct snd_kcontrol_new stac927x_mixer[] = {
        STAC_INPUT_SOURCE,
+       STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB),
        HDA_CODEC_VOLUME("InMux Capture Volume", 0x15, 0x0, HDA_OUTPUT),
        HDA_CODEC_VOLUME("InVol Capture Volume", 0x18, 0x0, HDA_INPUT),
        HDA_CODEC_MUTE("ADCMux Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -400,6 +457,7 @@ static struct snd_kcontrol_new stac9205_mixer[] = {
                .put = stac92xx_dmux_enum_put,
        },
        STAC_INPUT_SOURCE,
+       STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0),
        HDA_CODEC_VOLUME("InMux Capture Volume", 0x19, 0x0, HDA_OUTPUT),
        HDA_CODEC_VOLUME("InVol Capture Volume", 0x1b, 0x0, HDA_INPUT),
        HDA_CODEC_MUTE("ADCMux Capture Switch", 0x1d, 0x0, HDA_OUTPUT),