1 files changed, 9 insertions, 7 deletions

diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h
index 4dcd41b78258..63dc7a0ab555 100644
--- a/sound/pci/oxygen/oxygen_regs.h
+++ b/sound/pci/oxygen/oxygen_regs.h
@@ -139,9 +139,11 @@
 #define  OXYGEN_I2S_FORMAT_I2S          0x0000
 #define  OXYGEN_I2S_FORMAT_LJUST        0x0008
 #define  OXYGEN_I2S_MCLK_MASK           0x0030  /* MCLK/LRCK */
-#define  OXYGEN_I2S_MCLK_128            0x0000
-#define  OXYGEN_I2S_MCLK_256            0x0010
-#define  OXYGEN_I2S_MCLK_512            0x0020
+#define  OXYGEN_I2S_MCLK_SHIFT          4
+#define  MCLK_128                       0
+#define  MCLK_256                       1
+#define  MCLK_512                       2
+#define  OXYGEN_I2S_MCLK(f)             (((f) & 3) << OXYGEN_I2S_MCLK_SHIFT)
 #define  OXYGEN_I2S_BITS_MASK           0x00c0
 #define  OXYGEN_I2S_BITS_16             0x0000
 #define  OXYGEN_I2S_BITS_20             0x0040
@@ -238,11 +240,11 @@
 #define  OXYGEN_SPI_DATA_LENGTH_MASK    0x02
 #define  OXYGEN_SPI_DATA_LENGTH_2       0x00
 #define  OXYGEN_SPI_DATA_LENGTH_3       0x02
-#define  OXYGEN_SPI_CLOCK_MASK          0xc0
+#define  OXYGEN_SPI_CLOCK_MASK          0x0c
 #define  OXYGEN_SPI_CLOCK_160           0x00    /* ns */
-#define  OXYGEN_SPI_CLOCK_320           0x40
-#define  OXYGEN_SPI_CLOCK_640           0x80
-#define  OXYGEN_SPI_CLOCK_1280          0xc0
+#define  OXYGEN_SPI_CLOCK_320           0x04
+#define  OXYGEN_SPI_CLOCK_640           0x08
+#define  OXYGEN_SPI_CLOCK_1280          0x0c
 #define  OXYGEN_SPI_CODEC_MASK          0x70    /* 0..5 */
 #define  OXYGEN_SPI_CODEC_SHIFT         4
 #define  OXYGEN_SPI_CEN_MASK            0x80