diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-17 09:05:09 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:30:03 +0100 |
| commit | 05855ba3f405d02c4530072527d2b1c72e3b38a9 (patch) | |
| tree | a3a53083e0e773d606f56922f927f719568026d9 /sound/pci/oxygen/oxygen_regs.h | |
| parent | b8c5b53e1f104a9f877f947cdb86d5c7208d6c9a (diff) | |
| download | lwn-05855ba3f405d02c4530072527d2b1c72e3b38a9.tar.gz lwn-05855ba3f405d02c4530072527d2b1c72e3b38a9.zip | |
[ALSA] oxygen: make the I2S format configurable
Add proper register bit symbols for the I2S format field, and allow card
models to configure the I2S format to be used for the DACs and ADCs.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen_regs.h')
| -rw-r--r-- | sound/pci/oxygen/oxygen_regs.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h index 7a4726d2b2cf..b3491f73c598 100644 --- a/sound/pci/oxygen/oxygen_regs.h +++ b/sound/pci/oxygen/oxygen_regs.h @@ -105,18 +105,20 @@ #define OXYGEN_RATE_96000 0x0005 #define OXYGEN_RATE_176400 0x0006 #define OXYGEN_RATE_192000 0x0007 -#define OXYGEN_I2S_MAGIC1_MASK 0x0008 +#define OXYGEN_I2S_FORMAT_MASK 0x0008 +#define OXYGEN_I2S_FORMAT_I2S 0x0000 +#define OXYGEN_I2S_FORMAT_LJUST 0x0008 #define OXYGEN_I2S_MAGIC2_MASK 0x0030 -#define OXYGEN_I2S_FORMAT_MASK 0x00c0 -#define OXYGEN_I2S_FORMAT_16 0x0000 -#define OXYGEN_I2S_FORMAT_20 0x0040 -#define OXYGEN_I2S_FORMAT_24 0x0080 -#define OXYGEN_I2S_FORMAT_32 0x00c0 +#define OXYGEN_I2S_BITS_MASK 0x00c0 +#define OXYGEN_I2S_BITS_16 0x0000 +#define OXYGEN_I2S_BITS_20 0x0040 +#define OXYGEN_I2S_BITS_24 0x0080 +#define OXYGEN_I2S_BITS_32 0x00c0 #define OXYGEN_I2S_A_FORMAT 0x62 #define OXYGEN_I2S_B_FORMAT 0x64 #define OXYGEN_I2S_C_FORMAT 0x66 -/* OXYGEN_I2S_RATE_* and OXYGEN_I2S_FORMAT_* */ +/* like OXYGEN_I2S_MULTICH_FORMAT */ #define OXYGEN_SPDIF_CONTROL 0x70 #define OXYGEN_SPDIF_OUT_ENABLE 0x00000002 |