aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt38
-rw-r--r--sound/pci/ice1712/vt1720_mobo.h3
2 files changed, 35 insertions, 6 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 5a7f7f5b3d57..bb31ae7698b1 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -688,15 +688,19 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
688 * TerraTec EWS 88D 688 * TerraTec EWS 88D
689 * TerraTec EWX 24/96 689 * TerraTec EWX 24/96
690 * TerraTec DMX 6Fire 690 * TerraTec DMX 6Fire
691 * TerraTec Phase 88
691 * Hoontech SoundTrack DSP 24 692 * Hoontech SoundTrack DSP 24
692 * Hoontech SoundTrack DSP 24 Value 693 * Hoontech SoundTrack DSP 24 Value
693 * Hoontech SoundTrack DSP 24 Media 7.1 694 * Hoontech SoundTrack DSP 24 Media 7.1
695 * Event Electronics, EZ8
694 * Digigram VX442 696 * Digigram VX442
697 * Lionstracs, Mediastaton
695 698
696 model - Use the given board model, one of the following: 699 model - Use the given board model, one of the following:
697 delta1010, dio2496, delta66, delta44, audiophile, delta410, 700 delta1010, dio2496, delta66, delta44, audiophile, delta410,
698 delta1010lt, vx442, ewx2496, ews88mt, ews88mt_new, ews88d, 701 delta1010lt, vx442, ewx2496, ews88mt, ews88mt_new, ews88d,
699 dmx6fire, dsp24, dsp24_value, dsp24_71, ez8 702 dmx6fire, dsp24, dsp24_value, dsp24_71, ez8,
703 phase88, mediastation
700 omni - Omni I/O support for MidiMan M-Audio Delta44/66 704 omni - Omni I/O support for MidiMan M-Audio Delta44/66
701 cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transciever) 705 cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transciever)
702 in msec resolution, default value is 500 (0.5 sec) 706 in msec resolution, default value is 500 (0.5 sec)
@@ -705,20 +709,44 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
705 is not used with all Envy24 based cards (for example in the MidiMan Delta 709 is not used with all Envy24 based cards (for example in the MidiMan Delta
706 serie). 710 serie).
707 711
712 Note: The supported board is detected by reading EEPROM or PCI
713 SSID (if EEPROM isn't available). You can override the
714 model by passing "model" module option in case that the
715 driver isn't configured properly or you want to try another
716 type for testing.
717
708 Module snd-ice1724 718 Module snd-ice1724
709 ------------------ 719 ------------------
710 720
711 Module for Envy24HT (VT/ICE1724) based PCI sound cards. 721 Module for Envy24HT (VT/ICE1724), Envy24PT (VT1720) based PCI sound cards.
712 * MidiMan M Audio Revolution 7.1 722 * MidiMan M Audio Revolution 7.1
713 * AMP Ltd AUDIO2000 723 * AMP Ltd AUDIO2000
714 * TerraTec Aureon Sky-5.1, Space-7.1 724 * TerraTec Aureon 5.1 Sky
725 * TerraTec Aureon 7.1 Space
726 * TerraTec Aureon 7.1 Universe
727 * TerraTec Phase 22
728 * TerraTec Phase 28
729 * AudioTrak Prodigy 7.1
730 * AudioTrak Prodigy 192
731 * Pontis MS300
732 * Albatron K8X800 Pro II
733 * Chaintech ZNF3-150
734 * Chaintech ZNF3-250
735 * Chaintech 9CJS
736 * Shuttle SN25P
715 737
716 model - Use the given board model, one of the following: 738 model - Use the given board model, one of the following:
717 revo71, amp2000, prodigy71, aureon51, aureon71, 739 revo71, amp2000, prodigy71, prodigy192, aureon51,
718 k8x800 740 aureon71, universe, k8x800, phase22, phase28, ms300
719 741
720 Module supports up to 8 cards and autoprobe. 742 Module supports up to 8 cards and autoprobe.
721 743
744 Note: The supported board is detected by reading EEPROM or PCI
745 SSID (if EEPROM isn't available). You can override the
746 model by passing "model" module option in case that the
747 driver isn't configured properly or you want to try another
748 type for testing.
749
722 Module snd-intel8x0 750 Module snd-intel8x0
723 ------------------- 751 -------------------
724 752
diff --git a/sound/pci/ice1712/vt1720_mobo.h b/sound/pci/ice1712/vt1720_mobo.h
index e0b613c0f6a0..0b1b0ee1bea7 100644
--- a/sound/pci/ice1712/vt1720_mobo.h
+++ b/sound/pci/ice1712/vt1720_mobo.h
@@ -27,7 +27,8 @@
27#define VT1720_MOBO_DEVICE_DESC "{Albatron,K8X800 Pro II},"\ 27#define VT1720_MOBO_DEVICE_DESC "{Albatron,K8X800 Pro II},"\
28 "{Chaintech,ZNF3-150},"\ 28 "{Chaintech,ZNF3-150},"\
29 "{Chaintech,ZNF3-250},"\ 29 "{Chaintech,ZNF3-250},"\
30 "{Chaintech,9CJS}," 30 "{Chaintech,9CJS},"\
31 "{Shuttle,SN25P},"
31 32
32#define VT1720_SUBDEVICE_K8X800 0xf217052c 33#define VT1720_SUBDEVICE_K8X800 0xf217052c
33#define VT1720_SUBDEVICE_ZNF3_150 0x0f2741f6 34#define VT1720_SUBDEVICE_ZNF3_150 0x0f2741f6