diff options
author | Kailang Yang <kailang@realtek.com.tw> | 2008-05-27 05:44:55 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-05-27 09:56:21 -0400 |
commit | f269002e61446ed3410d8ca5f06ebca1e2760cb5 (patch) | |
tree | edf57a9b6a892b0deee884f457e2e62e5116d2d2 /sound/pci/hda/hda_intel.c | |
parent | 142054a389ebf7972b4eee822ad7c55ff852b649 (diff) |
[ALSA] hda - Add support of Teradici controller
Add the new PCI ID 0x6549 0x1200 Teradici controller.
Signed-off-by: Kailang Yang <kailang@realtek.com.tw>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 6ba7ac01d9f6..7f62196989a1 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -197,6 +197,10 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; | |||
197 | #define ATIHDMI_NUM_CAPTURE 0 | 197 | #define ATIHDMI_NUM_CAPTURE 0 |
198 | #define ATIHDMI_NUM_PLAYBACK 1 | 198 | #define ATIHDMI_NUM_PLAYBACK 1 |
199 | 199 | ||
200 | /* TERA has 4 playback and 3 capture */ | ||
201 | #define TERA_NUM_CAPTURE 3 | ||
202 | #define TERA_NUM_PLAYBACK 4 | ||
203 | |||
200 | /* this number is statically defined for simplicity */ | 204 | /* this number is statically defined for simplicity */ |
201 | #define MAX_AZX_DEV 16 | 205 | #define MAX_AZX_DEV 16 |
202 | 206 | ||
@@ -384,6 +388,7 @@ enum { | |||
384 | AZX_DRIVER_SIS, | 388 | AZX_DRIVER_SIS, |
385 | AZX_DRIVER_ULI, | 389 | AZX_DRIVER_ULI, |
386 | AZX_DRIVER_NVIDIA, | 390 | AZX_DRIVER_NVIDIA, |
391 | AZX_DRIVER_TERA, | ||
387 | }; | 392 | }; |
388 | 393 | ||
389 | static char *driver_short_names[] __devinitdata = { | 394 | static char *driver_short_names[] __devinitdata = { |
@@ -395,6 +400,7 @@ static char *driver_short_names[] __devinitdata = { | |||
395 | [AZX_DRIVER_SIS] = "HDA SIS966", | 400 | [AZX_DRIVER_SIS] = "HDA SIS966", |
396 | [AZX_DRIVER_ULI] = "HDA ULI M5461", | 401 | [AZX_DRIVER_ULI] = "HDA ULI M5461", |
397 | [AZX_DRIVER_NVIDIA] = "HDA NVidia", | 402 | [AZX_DRIVER_NVIDIA] = "HDA NVidia", |
403 | [AZX_DRIVER_TERA] = "HDA Teradici", | ||
398 | }; | 404 | }; |
399 | 405 | ||
400 | /* | 406 | /* |
@@ -1106,6 +1112,7 @@ static unsigned int azx_max_codecs[] __devinitdata = { | |||
1106 | [AZX_DRIVER_SIS] = 3, /* FIXME: correct? */ | 1112 | [AZX_DRIVER_SIS] = 3, /* FIXME: correct? */ |
1107 | [AZX_DRIVER_ULI] = 3, /* FIXME: correct? */ | 1113 | [AZX_DRIVER_ULI] = 3, /* FIXME: correct? */ |
1108 | [AZX_DRIVER_NVIDIA] = 3, /* FIXME: correct? */ | 1114 | [AZX_DRIVER_NVIDIA] = 3, /* FIXME: correct? */ |
1115 | [AZX_DRIVER_TERA] = 1, | ||
1109 | }; | 1116 | }; |
1110 | 1117 | ||
1111 | static int __devinit azx_codec_create(struct azx *chip, const char *model, | 1118 | static int __devinit azx_codec_create(struct azx *chip, const char *model, |
@@ -2229,6 +2236,8 @@ static struct pci_device_id azx_ids[] = { | |||
2229 | { PCI_DEVICE(0x10de, 0x0bd5), .driver_data = AZX_DRIVER_NVIDIA }, | 2236 | { PCI_DEVICE(0x10de, 0x0bd5), .driver_data = AZX_DRIVER_NVIDIA }, |
2230 | { PCI_DEVICE(0x10de, 0x0bd6), .driver_data = AZX_DRIVER_NVIDIA }, | 2237 | { PCI_DEVICE(0x10de, 0x0bd6), .driver_data = AZX_DRIVER_NVIDIA }, |
2231 | { PCI_DEVICE(0x10de, 0x0bd7), .driver_data = AZX_DRIVER_NVIDIA }, | 2238 | { PCI_DEVICE(0x10de, 0x0bd7), .driver_data = AZX_DRIVER_NVIDIA }, |
2239 | /* Teradici */ | ||
2240 | { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA }, | ||
2232 | { 0, } | 2241 | { 0, } |
2233 | }; | 2242 | }; |
2234 | MODULE_DEVICE_TABLE(pci, azx_ids); | 2243 | MODULE_DEVICE_TABLE(pci, azx_ids); |