Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / sound / pci / oxygen / oxygen_regs.h

diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h
index 530f1486f90101fdcbe1081e5fe82212ef20e0e5..72de159d45673b123df400486962078e3f401650 100644 (file)
--- a/sound/pci/oxygen/oxygen_regs.h
+++ b/sound/pci/oxygen/oxygen_regs.h
@@ -330,11 +330,11 @@
 #define  OXYGEN_PLAY_SPDIF_I2S_ADC_3   0x00e0
 #define  OXYGEN_PLAY_DAC0_SOURCE_MASK  0x0300
 #define  OXYGEN_PLAY_DAC0_SOURCE_SHIFT 8
-#define  OXYGEN_PLAY_DAC1_SOURCE_MASK  0x0700
+#define  OXYGEN_PLAY_DAC1_SOURCE_MASK  0x0c00
 #define  OXYGEN_PLAY_DAC1_SOURCE_SHIFT 10
 #define  OXYGEN_PLAY_DAC2_SOURCE_MASK  0x3000
 #define  OXYGEN_PLAY_DAC2_SOURCE_SHIFT 12
-#define  OXYGEN_PLAY_DAC3_SOURCE_MASK  0x7000
+#define  OXYGEN_PLAY_DAC3_SOURCE_MASK  0xc000
 #define  OXYGEN_PLAY_DAC3_SOURCE_SHIFT 14
 
 #define OXYGEN_REC_ROUTING             0xc2
@@ -360,10 +360,14 @@
 #define  OXYGEN_ADC_MONITOR_C_HALF_VOL 0x20
 
 #define OXYGEN_A_MONITOR_ROUTING       0xc4
-#define  OXYGEN_A_MONITOR_ROUTE_01_MASK        0x03
-#define  OXYGEN_A_MONITOR_ROUTE_23_MASK        0x0c
-#define  OXYGEN_A_MONITOR_ROUTE_45_MASK        0x30
-#define  OXYGEN_A_MONITOR_ROUTE_67_MASK        0xc0
+#define  OXYGEN_A_MONITOR_ROUTE_0_MASK 0x03
+#define  OXYGEN_A_MONITOR_ROUTE_0_SHIFT        0
+#define  OXYGEN_A_MONITOR_ROUTE_1_MASK 0x0c
+#define  OXYGEN_A_MONITOR_ROUTE_1_SHIFT        2
+#define  OXYGEN_A_MONITOR_ROUTE_2_MASK 0x30
+#define  OXYGEN_A_MONITOR_ROUTE_2_SHIFT        4
+#define  OXYGEN_A_MONITOR_ROUTE_3_MASK 0xc0
+#define  OXYGEN_A_MONITOR_ROUTE_3_SHIFT        6
 
 #define OXYGEN_AC97_CONTROL            0xd0
 #define  OXYGEN_AC97_COLD_RESET                0x0001