]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ALSA: oxygen: fix chip ID register symbols
authorClemens Ladisch <clemens@ladisch.de>
Mon, 4 Oct 2010 11:24:43 +0000 (13:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 5 Oct 2010 16:11:22 +0000 (18:11 +0200)
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>
sound/pci/oxygen/oxygen_regs.h

index 72de159d45673b123df400486962078e3f401650..4dcd41b782586b7d7d9251a4c75aef37c36a4169 100644 (file)
 /* OXYGEN_CHANNEL_* */
 
 #define OXYGEN_CODEC_VERSION           0xe4
-#define  OXYGEN_XCID_MASK              0x07
+#define  OXYGEN_CODEC_ID_MASK          0x07
 
 #define OXYGEN_REVISION                        0xe6
-#define  OXYGEN_REVISION_XPKGID_MASK   0x0007
+#define  OXYGEN_PACKAGE_ID_MASK                0x0007
+#define  OXYGEN_PACKAGE_ID_8786                0x0004
+#define  OXYGEN_PACKAGE_ID_8787                0x0006
+#define  OXYGEN_PACKAGE_ID_8788                0x0007
 #define  OXYGEN_REVISION_MASK          0xfff8
-#define  OXYGEN_REVISION_2             0x0008  /* bit flag */
-#define  OXYGEN_REVISION_8787          0x0014  /* 8 bits */
+#define  OXYGEN_REVISION_2             0x0008
 
 #define OXYGEN_OFFSIN_48K              0xe8
 #define OXYGEN_OFFSBASE_48K            0xe9