diff options
Diffstat (limited to 'sound/pci/ac97/ac97_codec.c')
-rw-r--r-- | sound/pci/ac97/ac97_codec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index e2b843b4f9d0..97ee127ac33d 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
@@ -143,6 +143,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { | |||
143 | { 0x43525970, 0xfffffff8, "CS4202", NULL, NULL }, | 143 | { 0x43525970, 0xfffffff8, "CS4202", NULL, NULL }, |
144 | { 0x43585421, 0xffffffff, "HSD11246", NULL, NULL }, // SmartMC II | 144 | { 0x43585421, 0xffffffff, "HSD11246", NULL, NULL }, // SmartMC II |
145 | { 0x43585428, 0xfffffff8, "Cx20468", patch_conexant, NULL }, // SmartAMC fixme: the mask might be different | 145 | { 0x43585428, 0xfffffff8, "Cx20468", patch_conexant, NULL }, // SmartAMC fixme: the mask might be different |
146 | { 0x43585430, 0xffffffff, "Cx20468-31", patch_conexant, NULL }, | ||
146 | { 0x43585431, 0xffffffff, "Cx20551", patch_cx20551, NULL }, | 147 | { 0x43585431, 0xffffffff, "Cx20551", patch_cx20551, NULL }, |
147 | { 0x44543031, 0xfffffff0, "DT0398", NULL, NULL }, | 148 | { 0x44543031, 0xfffffff0, "DT0398", NULL, NULL }, |
148 | { 0x454d4328, 0xffffffff, "EM28028", NULL, NULL }, // same as TR28028? | 149 | { 0x454d4328, 0xffffffff, "EM28028", NULL, NULL }, // same as TR28028? |
@@ -383,7 +384,7 @@ int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned sho | |||
383 | 384 | ||
384 | EXPORT_SYMBOL(snd_ac97_update_bits); | 385 | EXPORT_SYMBOL(snd_ac97_update_bits); |
385 | 386 | ||
386 | /* no lock version - see snd_ac97_updat_bits() */ | 387 | /* no lock version - see snd_ac97_update_bits() */ |
387 | int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, | 388 | int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, |
388 | unsigned short mask, unsigned short value) | 389 | unsigned short mask, unsigned short value) |
389 | { | 390 | { |
@@ -1643,7 +1644,10 @@ static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97) | |||
1643 | { | 1644 | { |
1644 | int err, idx; | 1645 | int err, idx; |
1645 | 1646 | ||
1646 | //printk("AC97_GPIO_CFG = %x\n",snd_ac97_read(ac97,AC97_GPIO_CFG)); | 1647 | /* |
1648 | printk(KERN_DEBUG "AC97_GPIO_CFG = %x\n", | ||
1649 | snd_ac97_read(ac97,AC97_GPIO_CFG)); | ||
1650 | */ | ||
1647 | snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH)); | 1651 | snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH)); |
1648 | snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH)); | 1652 | snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH)); |
1649 | snd_ac97_write(ac97, AC97_GPIO_STICKY, 0xffff); | 1653 | snd_ac97_write(ac97, AC97_GPIO_STICKY, 0xffff); |