Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28522
b: refs/heads/master
c: c513027
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jun 22, 2006
1 parent 2f53c5b commit 9dc78ea
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d5a31b8b6e79145c832d530743ca80bf5f58a965
refs/heads/master: c51302710546f075e65b1e70487707e8324abf2f
26 changes: 16 additions & 10 deletions trunk/sound/pci/ice1712/aureon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1281,9 +1281,15 @@ static int aureon_set_headphone_amp(struct snd_ice1712 *ice, int enable)

tmp2 = tmp = snd_ice1712_gpio_read(ice);
if (enable)
tmp |= AUREON_HP_SEL;
if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT)
tmp |= AUREON_HP_SEL;
else
tmp |= PRODIGY_HP_SEL;
else
tmp &= ~ AUREON_HP_SEL;
if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT)
tmp &= ~ AUREON_HP_SEL;
else
tmp &= ~ PRODIGY_HP_SEL;
if (tmp != tmp2) {
snd_ice1712_gpio_write(ice, tmp);
return 1;
Expand Down Expand Up @@ -2079,16 +2085,16 @@ static unsigned char prodigy71_eeprom[] __devinitdata = {
};

static unsigned char prodigy71lt_eeprom[] __devinitdata = {
0x0b, /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
0x4b, /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
0x80, /* ACLINK: I2S */
0xfc, /* I2S: vol, 96k, 24bit, 192k */
0xc3, /* SPDUF: out-en, out-int */
0x00, /* GPIO_DIR */
0x07, /* GPIO_DIR1 */
0x00, /* GPIO_DIR2 */
0xff, /* GPIO_MASK */
0xf8, /* GPIO_MASK1 */
0xff, /* GPIO_MASK2 */
0xc3, /* SPDIF: out-en, out-int, spdif-in */
0xff, /* GPIO_DIR */
0xff, /* GPIO_DIR1 */
0x5f, /* GPIO_DIR2 */
0x00, /* GPIO_MASK */
0x00, /* GPIO_MASK1 */
0x00, /* GPIO_MASK2 */
0x00, /* GPIO_STATE */
0x00, /* GPIO_STATE1 */
0x00, /* GPIO_STATE2 */
Expand Down
1 change: 1 addition & 0 deletions trunk/sound/pci/ice1712/aureon.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ extern struct snd_ice1712_card_info snd_vt1724_aureon_cards[];
#define PRODIGY_WM_CS (1 << 8)
#define PRODIGY_SPI_MOSI (1 << 10)
#define PRODIGY_SPI_CLK (1 << 9)
#define PRODIGY_HP_SEL (1 << 5)

#endif /* __SOUND_AUREON_H */

0 comments on commit 9dc78ea

Please sign in to comment.