Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c157069 authored by James Courtier-Dutton's avatar James Courtier-Dutton Committed by Jaroslav Kysela
Browse files

[ALSA] ca0106: Fix sound capture on Audigy LS via AC97. 



Fixes ALSA bug#2286

Signed-off-by: default avatarJames Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent a5f65029

sound/pci/ca0106/ca0106_main.c

+16 −3
Original line number Diff line number Diff line
@@ -1382,7 +1382,6 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card, 
	snd_ca0106_ptr_write(chip, SPDIF_SELECT1, 0, 0xf);

	snd_ca0106_ptr_write(chip, SPDIF_SELECT2, 0, 0x000f0000); /* 0x0b000000 for digital, 0x000b0000 for analog, from win2000 drivers. Use 0x000f0000 for surround71 */

	chip->spdif_enable = 0; /* Set digital SPDIF output off */

	chip->capture_source = 3; /* Set CAPTURE_SOURCE */

	//snd_ca0106_ptr_write(chip, 0x45, 0, 0); /* Analogue out */

	//snd_ca0106_ptr_write(chip, 0x45, 0, 0xf00); /* Digital out */
@@ -1402,8 +1401,22 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card, 
		snd_ca0106_ptr_write(chip, PLAYBACK_VOLUME1, ch, 0xffffffff); /* Mute */

		snd_ca0106_ptr_write(chip, PLAYBACK_VOLUME2, ch, 0xffffffff); /* Mute */

	}

        snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */

	chip->capture_source = 3; /* Set CAPTURE_SOURCE */

	if (chip->details->i2c_adc == 1) {

	        /* Select MIC, Line in, TAD in, AUX in */

	        snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4);

		/* Default to CAPTURE_SOURCE to i2s in */

		chip->capture_source = 3;

	} else if (chip->details->ac97 == 1) {

	        /* Default to AC97 in */

	        snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x444400e4);

		/* Default to CAPTURE_SOURCE to AC97 in */

		chip->capture_source = 4;

	} else {

	        /* Select MIC, Line in, TAD in, AUX in */

	        snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4);

		/* Default to Set CAPTURE_SOURCE to i2s in */

		chip->capture_source = 3;

	}



        if (chip->details->gpio_type == 2) { /* The SB0438 use GPIO differently. */

		/* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */

sound/pci/ca0106/ca0106_mixer.c

+24 −18
Original line number Diff line number Diff line
@@ -482,19 +482,6 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol, 
	.private_value = ((chid) << 8) | (reg)			\

}



#define I2C_VOLUME(xname,chid) \

{								\

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,	\

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |		\

	          SNDRV_CTL_ELEM_ACCESS_TLV_READ,		\

	.info =  snd_ca0106_i2c_volume_info,			\

	.get =   snd_ca0106_i2c_volume_get,			\

	.put =   snd_ca0106_i2c_volume_put,			\

	.tlv = { .p = snd_ca0106_db_scale2 },			\

	.private_value = chid					\

}





static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {

	CA_VOLUME("Analog Front Playback Volume",

		  CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME2),
@@ -517,11 +504,6 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = { 
        CA_VOLUME("CAPTURE feedback Playback Volume",

		  1, CAPTURE_CONTROL),



        I2C_VOLUME("Phone Capture Volume", 0),

        I2C_VOLUME("Mic Capture Volume", 1),

        I2C_VOLUME("Line in Capture Volume", 2),

        I2C_VOLUME("Aux Capture Volume", 3),



	{

		.access =	SNDRV_CTL_ELEM_ACCESS_READ,

		.iface =        SNDRV_CTL_ELEM_IFACE_PCM,
@@ -561,6 +543,25 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = { 
	},

};



#define I2C_VOLUME(xname,chid) \

{								\

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,	\

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |		\

	          SNDRV_CTL_ELEM_ACCESS_TLV_READ,		\

	.info =  snd_ca0106_i2c_volume_info,			\

	.get =   snd_ca0106_i2c_volume_get,			\

	.put =   snd_ca0106_i2c_volume_put,			\

	.tlv = { .p = snd_ca0106_db_scale2 },			\

	.private_value = chid					\

}



static struct snd_kcontrol_new snd_ca0106_volume_i2c_adc_ctls[] __devinitdata = {

        I2C_VOLUME("Phone Capture Volume", 0),

        I2C_VOLUME("Mic Capture Volume", 1),

        I2C_VOLUME("Line in Capture Volume", 2),

        I2C_VOLUME("Aux Capture Volume", 3),

};



static int __devinit remove_ctl(struct snd_card *card, const char *name)

{

	struct snd_ctl_elem_id id;
@@ -645,6 +646,11 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) 
			return err;

	}

	if (emu->details->i2c_adc == 1) {

		for (i = 0; i < ARRAY_SIZE(snd_ca0106_volume_i2c_adc_ctls); i++) {

			err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_volume_i2c_adc_ctls[i], emu));

			if (err < 0)

				return err;

		}

		if (emu->details->gpio_type == 1)

			err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_capture_mic_line_in, emu));

		else  /* gpio_type == 2 */