summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/ad1836.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-07 00:57:54 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-07 00:57:54 +0400
commit46758dee727348d3648c83445d10ded321376543 (patch)
tree3c0649b6150901d1d480b3c3a84c45341b09ce2d /sound/soc/codecs/ad1836.h
parentf97d0c6d5f947a96a6d3957eff3da6d9ca246e54 (diff)
parent8ca695f273709a9d147826716a8dee3e0eb2407f (diff)
downloadlinux-46758dee727348d3648c83445d10ded321376543.tar.xz
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/codecs/ad1836.h')
-rw-r--r--sound/soc/codecs/ad1836.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/ad1836.h b/sound/soc/codecs/ad1836.h
index 4ed7d9dfb346..f13402fe7333 100644
--- a/sound/soc/codecs/ad1836.h
+++ b/sound/soc/codecs/ad1836.h
@@ -25,6 +25,7 @@
#define AD1836_DAC_SERFMT_PCK256 (0x4 << 5)
#define AD1836_DAC_SERFMT_PCK128 (0x5 << 5)
#define AD1836_DAC_WORD_LEN_MASK 0x18
+#define AD1836_DAC_WORD_LEN_OFFSET 3
#define AD1836_DAC_CTRL2 1
@@ -42,6 +43,7 @@
#define AD1836_ADC_CTRL2 13
#define AD1836_ADC_WORD_LEN_MASK 0x30
+#define AD1836_ADC_WORD_OFFSET 5
#define AD1836_ADC_SERFMT_MASK (7 << 6)
#define AD1836_ADC_SERFMT_PCK256 (0x4 << 6)
#define AD1836_ADC_SERFMT_PCK128 (0x5 << 6)
@@ -51,4 +53,8 @@
#define AD1836_NUM_REGS 16
+#define AD1836_WORD_LEN_24 0x0
+#define AD1836_WORD_LEN_20 0x1
+#define AD1836_WORD_LEN_16 0x2
+
#endif