Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b636a1d947c7f1bb0e0a157663e08ce3e49b2e52

Authored by Vedran Miletic
Committed by Jaroslav Kysela
1 parent 00ef50c242
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: cs46xx: Add PCI IDs for TerraTec and Hercules cards 

This patch adds PCI IDs for:
* TerraTec DMX XFire 1024
* Hercules Gamesurround Fortissimo II
* Hercules Gamesurround Fortissimo III 7.1
All those cards were supported as generic CS46xx device,
so they will work as before. I'm pretty sure that first two
cards work, as they have same hardware design as reference
card. Not sure about Fortissimo III, but this won't break it
if it worked.

Tested on TerraTec DMX XFire 1024.

Signed-off-by: Vedran Miletic <rivanvx@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Showing 1 changed file with 18 additions and 1 deletions Side-by-side Diff

sound/pci/cs46xx/cs46xx_lib.c
Diff comments   View file @ b636a1d
... ... @@ -3501,8 +3501,9 @@
3501 3501 .name = "Mitac MI6020/21",
3502 3502 .amp = amp_voyetra,
3503 3503 },
  3504 + /* Hercules Game Theatre XP */
3504 3505 {
3505   - .vendor = 0x14AF,
  3506 + .vendor = 0x14af, /* Guillemot Corporation */
3506 3507 .id = 0x0050,
3507 3508 .name = "Hercules Game Theatre XP",
3508 3509 .amp = amp_hercules,
3509 3510  
... ... @@ -3544,7 +3545,23 @@
3544 3545 .amp = amp_hercules,
3545 3546 .mixer_init = hercules_mixer_init,
3546 3547 },
  3548 + /* Herculess Fortissimo */
  3549 + {
  3550 + .vendor = 0x1681,
  3551 + .id = 0xa010,
  3552 + .name = "Hercules Gamesurround Fortissimo II",
  3553 + },
  3554 + {
  3555 + .vendor = 0x1681,
  3556 + .id = 0xa011,
  3557 + .name = "Hercules Gamesurround Fortissimo III 7.1",
  3558 + },
3547 3559 /* Teratec */
  3560 + {
  3561 + .vendor = 0x153b,
  3562 + .id = 0x112e,
  3563 + .name = "Terratec DMX XFire 1024",
  3564 + },
3548 3565 {
3549 3566 .vendor = 0x153b,
3550 3567 .id = 0x1136,