diff options
| author | Wei Ni <wni@nvidia.com> | 2010-03-03 02:05:53 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-04 09:53:56 -0500 |
| commit | 7445dfc159f90b4bc82fd7d898b53d74520e2f83 (patch) | |
| tree | a8b5e4e06a67935ca440709c1a48ca55521b7cc1 | |
| parent | 28aedaf7bf6e4b629aea333978e8bb440bd1eb4f (diff) | |
ALSA: hda - Support max codecs to 8 for nvidia hda controller
Support max codecs to 8 for nvidia hda controller.
Change AZX_MAX_CODECS to 8, and add
"#define AZX_DEFAULT_CODECS 4" for default driver.
Set azx_max_codecs to 8 for nvidia controller.
Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1adac8cc9592..b1047570e78d 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -267,7 +267,8 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; | |||
| 267 | #define RIRB_INT_MASK 0x05 | 267 | #define RIRB_INT_MASK 0x05 |
| 268 | 268 | ||
| 269 | /* STATESTS int mask: S3,SD2,SD1,SD0 */ | 269 | /* STATESTS int mask: S3,SD2,SD1,SD0 */ |
| 270 | #define AZX_MAX_CODECS 4 | 270 | #define AZX_MAX_CODECS 8 |
| 271 | #define AZX_DEFAULT_CODECS 4 | ||
| 271 | #define STATESTS_INT_MASK ((1 << AZX_MAX_CODECS) - 1) | 272 | #define STATESTS_INT_MASK ((1 << AZX_MAX_CODECS) - 1) |
| 272 | 273 | ||
| 273 | /* SD_CTL bits */ | 274 | /* SD_CTL bits */ |
| @@ -1367,6 +1368,7 @@ static void azx_bus_reset(struct hda_bus *bus) | |||
| 1367 | 1368 | ||
| 1368 | /* number of codec slots for each chipset: 0 = default slots (i.e. 4) */ | 1369 | /* number of codec slots for each chipset: 0 = default slots (i.e. 4) */ |
| 1369 | static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = { | 1370 | static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = { |
| 1371 | [AZX_DRIVER_NVIDIA] = 8, | ||
| 1370 | [AZX_DRIVER_TERA] = 1, | 1372 | [AZX_DRIVER_TERA] = 1, |
| 1371 | }; | 1373 | }; |
| 1372 | 1374 | ||
| @@ -1399,7 +1401,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model) | |||
| 1399 | codecs = 0; | 1401 | codecs = 0; |
| 1400 | max_slots = azx_max_codecs[chip->driver_type]; | 1402 | max_slots = azx_max_codecs[chip->driver_type]; |
| 1401 | if (!max_slots) | 1403 | if (!max_slots) |
| 1402 | max_slots = AZX_MAX_CODECS; | 1404 | max_slots = AZX_DEFAULT_CODECS; |
| 1403 | 1405 | ||
| 1404 | /* First try to probe all given codec slots */ | 1406 | /* First try to probe all given codec slots */ |
| 1405 | for (c = 0; c < max_slots; c++) { | 1407 | for (c = 0; c < max_slots; c++) { |
