diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-11-26 04:37:23 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-28 08:49:54 -0500 |
commit | de04b102bfc9a13e96f0892305b394077ffb6514 (patch) | |
tree | d8fd0006036a5c7d8368fcaa98c110fa650fdc74 /sound | |
parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) |
ALSA: oxygen: add Claro halo support
Add support for the HT-Omega Claro halo (XT).
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/Kconfig | 3 | ||||
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 7003711f4fcc..611df4b72831 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -208,7 +208,8 @@ config SND_OXYGEN | |||
208 | * AuzenTech X-Meridian | 208 | * AuzenTech X-Meridian |
209 | * Bgears b-Enspirer | 209 | * Bgears b-Enspirer |
210 | * Club3D Theatron DTS | 210 | * Club3D Theatron DTS |
211 | * HT-Omega Claro | 211 | * HT-Omega Claro (plus) |
212 | * HT-Omega Claro halo (XT) | ||
212 | * Razer Barracuda AC-1 | 213 | * Razer Barracuda AC-1 |
213 | * Sondigo Inferno | 214 | * Sondigo Inferno |
214 | 215 | ||
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index b60f6212745a..de999c6d6dd3 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -61,6 +61,7 @@ MODULE_PARM_DESC(enable, "enable card"); | |||
61 | enum { | 61 | enum { |
62 | MODEL_CMEDIA_REF, /* C-Media's reference design */ | 62 | MODEL_CMEDIA_REF, /* C-Media's reference design */ |
63 | MODEL_MERIDIAN, /* AuzenTech X-Meridian */ | 63 | MODEL_MERIDIAN, /* AuzenTech X-Meridian */ |
64 | MODEL_HALO, /* HT-Omega Claro halo */ | ||
64 | }; | 65 | }; |
65 | 66 | ||
66 | static struct pci_device_id oxygen_ids[] __devinitdata = { | 67 | static struct pci_device_id oxygen_ids[] __devinitdata = { |
@@ -74,6 +75,7 @@ static struct pci_device_id oxygen_ids[] __devinitdata = { | |||
74 | { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF }, | 75 | { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF }, |
75 | { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN }, | 76 | { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN }, |
76 | { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CMEDIA_REF }, | 77 | { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CMEDIA_REF }, |
78 | { OXYGEN_PCI_SUBID(0x7284, 0x9781), .driver_data = MODEL_HALO }, | ||
77 | { } | 79 | { } |
78 | }; | 80 | }; |
79 | MODULE_DEVICE_TABLE(pci, oxygen_ids); | 81 | MODULE_DEVICE_TABLE(pci, oxygen_ids); |
@@ -301,6 +303,8 @@ static int generic_probe(struct oxygen *chip, unsigned long driver_data) | |||
301 | PLAYBACK_1_TO_SPDIF | | 303 | PLAYBACK_1_TO_SPDIF | |
302 | CAPTURE_0_FROM_I2S_2 | | 304 | CAPTURE_0_FROM_I2S_2 | |
303 | CAPTURE_1_FROM_SPDIF; | 305 | CAPTURE_1_FROM_SPDIF; |
306 | } | ||
307 | if (driver_data == MODEL_MERIDIAN || driver_data == MODEL_HALO) { | ||
304 | chip->model.misc_flags = OXYGEN_MISC_MIDI; | 308 | chip->model.misc_flags = OXYGEN_MISC_MIDI; |
305 | chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT; | 309 | chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT; |
306 | } | 310 | } |