Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c51302710546f075e65b1e70487707e8324abf2f

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent d5a31b8b6e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ALSA] ice1724 - Add functionality for Audiotrak Prodigy 7.1 LT 

This patch adds support for useable front audio channels,
user controllable headphone channel and optical output.
From: Anho Ki
Signed-off-by: Matt Taylor <mwtaylor@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 2 changed files with 17 additions and 10 deletions Side-by-side Diff

sound/pci/ice1712/aureon.c
Diff comments   View file @ c513027
... ... @@ -1281,9 +1281,15 @@
1281 1281  
1282 1282 tmp2 = tmp = snd_ice1712_gpio_read(ice);
1283 1283 if (enable)
1284   - tmp |= AUREON_HP_SEL;
  1284 + if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT)
  1285 + tmp |= AUREON_HP_SEL;
  1286 + else
  1287 + tmp |= PRODIGY_HP_SEL;
1285 1288 else
1286   - tmp &= ~ AUREON_HP_SEL;
  1289 + if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT)
  1290 + tmp &= ~ AUREON_HP_SEL;
  1291 + else
  1292 + tmp &= ~ PRODIGY_HP_SEL;
1287 1293 if (tmp != tmp2) {
1288 1294 snd_ice1712_gpio_write(ice, tmp);
1289 1295 return 1;
1290 1296  
... ... @@ -2079,16 +2085,16 @@
2079 2085 };
2080 2086  
2081 2087 static unsigned char prodigy71lt_eeprom[] __devinitdata = {
2082   - 0x0b, /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
  2088 + 0x4b, /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
2083 2089 0x80, /* ACLINK: I2S */
2084 2090 0xfc, /* I2S: vol, 96k, 24bit, 192k */
2085   - 0xc3, /* SPDUF: out-en, out-int */
2086   - 0x00, /* GPIO_DIR */
2087   - 0x07, /* GPIO_DIR1 */
2088   - 0x00, /* GPIO_DIR2 */
2089   - 0xff, /* GPIO_MASK */
2090   - 0xf8, /* GPIO_MASK1 */
2091   - 0xff, /* GPIO_MASK2 */
  2091 + 0xc3, /* SPDIF: out-en, out-int, spdif-in */
  2092 + 0xff, /* GPIO_DIR */
  2093 + 0xff, /* GPIO_DIR1 */
  2094 + 0x5f, /* GPIO_DIR2 */
  2095 + 0x00, /* GPIO_MASK */
  2096 + 0x00, /* GPIO_MASK1 */
  2097 + 0x00, /* GPIO_MASK2 */
2092 2098 0x00, /* GPIO_STATE */
2093 2099 0x00, /* GPIO_STATE1 */
2094 2100 0x00, /* GPIO_STATE2 */
sound/pci/ice1712/aureon.h
Diff comments   View file @ c513027
... ... @@ -58,6 +58,7 @@
58 58 #define PRODIGY_WM_CS (1 << 8)
59 59 #define PRODIGY_SPI_MOSI (1 << 10)
60 60 #define PRODIGY_SPI_CLK (1 << 9)
  61 +#define PRODIGY_HP_SEL (1 << 5)
61 62  
62 63 #endif /* __SOUND_AUREON_H */