diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2010-10-04 07:24:43 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-10-05 12:11:22 -0400 |
commit | de0074ee7ae7d61da40567afa53912d7e3e16b25 (patch) | |
tree | ef1426e8b74ce3dea11059bcbb9746b658bb3223 /sound/pci/oxygen/oxygen_regs.h | |
parent | d737f3eedef0717c8b8233bb6455ff13637ff243 (diff) |
ALSA: oxygen: fix chip ID register symbols
Rename the symbol for the XCID pins, fix up a decimal/hex confusion for
the CMI8787 package ID, and add the other known package IDs.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_regs.h')
-rw-r--r-- | sound/pci/oxygen/oxygen_regs.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h index 72de159d4567..4dcd41b78258 100644 --- a/sound/pci/oxygen/oxygen_regs.h +++ b/sound/pci/oxygen/oxygen_regs.h | |||
@@ -436,13 +436,15 @@ | |||
436 | /* OXYGEN_CHANNEL_* */ | 436 | /* OXYGEN_CHANNEL_* */ |
437 | 437 | ||
438 | #define OXYGEN_CODEC_VERSION 0xe4 | 438 | #define OXYGEN_CODEC_VERSION 0xe4 |
439 | #define OXYGEN_XCID_MASK 0x07 | 439 | #define OXYGEN_CODEC_ID_MASK 0x07 |
440 | 440 | ||
441 | #define OXYGEN_REVISION 0xe6 | 441 | #define OXYGEN_REVISION 0xe6 |
442 | #define OXYGEN_REVISION_XPKGID_MASK 0x0007 | 442 | #define OXYGEN_PACKAGE_ID_MASK 0x0007 |
443 | #define OXYGEN_PACKAGE_ID_8786 0x0004 | ||
444 | #define OXYGEN_PACKAGE_ID_8787 0x0006 | ||
445 | #define OXYGEN_PACKAGE_ID_8788 0x0007 | ||
443 | #define OXYGEN_REVISION_MASK 0xfff8 | 446 | #define OXYGEN_REVISION_MASK 0xfff8 |
444 | #define OXYGEN_REVISION_2 0x0008 /* bit flag */ | 447 | #define OXYGEN_REVISION_2 0x0008 |
445 | #define OXYGEN_REVISION_8787 0x0014 /* 8 bits */ | ||
446 | 448 | ||
447 | #define OXYGEN_OFFSIN_48K 0xe8 | 449 | #define OXYGEN_OFFSIN_48K 0xe8 |
448 | #define OXYGEN_OFFSBASE_48K 0xe9 | 450 | #define OXYGEN_OFFSBASE_48K 0xe9 |