[ALSA] ca0106: Fixes MSI K8N's SB Live 24 bit, no sound from line-in.
Fixed bug#1331 Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
This commit is contained in:
parent
3969f6178b
commit
be0b7b0113
|
@ -195,9 +195,14 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
|
||||||
.i2c_adc = 1,
|
.i2c_adc = 1,
|
||||||
.spi_dac = 1 } ,
|
.spi_dac = 1 } ,
|
||||||
/* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
|
/* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
|
||||||
|
/* SB0438
|
||||||
|
* CTRL:CA0106-DAT
|
||||||
|
* ADC: WM8775SEDS
|
||||||
|
* DAC: CS4382-KQZ
|
||||||
|
*/
|
||||||
{ .serial = 0x10091462,
|
{ .serial = 0x10091462,
|
||||||
.name = "MSI K8N Diamond MB [SB0438]",
|
.name = "MSI K8N Diamond MB [SB0438]",
|
||||||
.gpio_type = 1,
|
.gpio_type = 2,
|
||||||
.i2c_adc = 1 } ,
|
.i2c_adc = 1 } ,
|
||||||
/* Shuttle XPC SD31P which has an onboard Creative Labs
|
/* Shuttle XPC SD31P which has an onboard Creative Labs
|
||||||
* Sound Blaster Live! 24-bit EAX
|
* Sound Blaster Live! 24-bit EAX
|
||||||
|
@ -1380,7 +1385,7 @@ static int __devinit snd_ca0106_create(struct snd_card *card,
|
||||||
snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */
|
snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */
|
||||||
chip->capture_source = 3; /* Set CAPTURE_SOURCE */
|
chip->capture_source = 3; /* Set CAPTURE_SOURCE */
|
||||||
|
|
||||||
if (chip->details->gpio_type == 2) { /* The SB0410 and SB0413 use GPIO differently. */
|
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. */
|
/* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */
|
||||||
outl(0x0, chip->port+GPIO);
|
outl(0x0, chip->port+GPIO);
|
||||||
//outl(0x00f0e000, chip->port+GPIO); /* Analog */
|
//outl(0x00f0e000, chip->port+GPIO); /* Analog */
|
||||||
|
|
|
@ -227,6 +227,20 @@ static int snd_ca0106_i2c_capture_source_put(struct snd_kcontrol *kcontrol,
|
||||||
return change;
|
return change;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int snd_ca0106_capture_line_in_side_out_info(struct snd_kcontrol *kcontrol,
|
||||||
|
struct snd_ctl_elem_info *uinfo)
|
||||||
|
{
|
||||||
|
static char *texts[2] = { "Side out", "Line in" };
|
||||||
|
|
||||||
|
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
|
||||||
|
uinfo->count = 1;
|
||||||
|
uinfo->value.enumerated.items = 2;
|
||||||
|
if (uinfo->value.enumerated.item > 1)
|
||||||
|
uinfo->value.enumerated.item = 1;
|
||||||
|
strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int snd_ca0106_capture_mic_line_in_info(struct snd_kcontrol *kcontrol,
|
static int snd_ca0106_capture_mic_line_in_info(struct snd_kcontrol *kcontrol,
|
||||||
struct snd_ctl_elem_info *uinfo)
|
struct snd_ctl_elem_info *uinfo)
|
||||||
{
|
{
|
||||||
|
@ -287,6 +301,16 @@ static struct snd_kcontrol_new snd_ca0106_capture_mic_line_in __devinitdata =
|
||||||
.put = snd_ca0106_capture_mic_line_in_put
|
.put = snd_ca0106_capture_mic_line_in_put
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static struct snd_kcontrol_new snd_ca0106_capture_line_in_side_out __devinitdata =
|
||||||
|
{
|
||||||
|
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||||
|
.name = "Shared Line in/Side out Capture Switch",
|
||||||
|
.info = snd_ca0106_capture_line_in_side_out_info,
|
||||||
|
.get = snd_ca0106_capture_mic_line_in_get,
|
||||||
|
.put = snd_ca0106_capture_mic_line_in_put
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
static int snd_ca0106_spdif_info(struct snd_kcontrol *kcontrol,
|
static int snd_ca0106_spdif_info(struct snd_kcontrol *kcontrol,
|
||||||
struct snd_ctl_elem_info *uinfo)
|
struct snd_ctl_elem_info *uinfo)
|
||||||
{
|
{
|
||||||
|
@ -611,7 +635,10 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
if (emu->details->i2c_adc == 1) {
|
if (emu->details->i2c_adc == 1) {
|
||||||
err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_capture_mic_line_in, emu));
|
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 */
|
||||||
|
err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_capture_line_in_side_out, emu));
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue