aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-26 11:29:54 +0000
committerMark Brown <broonie@kernel.org>2015-01-26 11:29:54 +0000
commitd9b35aa056e015a78adbb0b393a0082c931d84dd (patch)
tree164b8a9103b38bbe88b837f9ce2d9b1e8830ddf5 /sound
parentLinux 3.19-rc6 (diff)
parentASoC: fsl_esai: Fix incorrect xDC field width of xCCR registers (diff)
downloadlinux-dev-d9b35aa056e015a78adbb0b393a0082c931d84dd.tar.xz
linux-dev-d9b35aa056e015a78adbb0b393a0082c931d84dd.zip
Merge remote-tracking branch 'asoc/fix/fsl-esai' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/fsl_esai.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_esai.h b/sound/soc/fsl/fsl_esai.h
index 91a550f4a10d..5e793bbb6b02 100644
--- a/sound/soc/fsl/fsl_esai.h
+++ b/sound/soc/fsl/fsl_esai.h
@@ -302,7 +302,7 @@
#define ESAI_xCCR_xFP_MASK (((1 << ESAI_xCCR_xFP_WIDTH) - 1) << ESAI_xCCR_xFP_SHIFT)
#define ESAI_xCCR_xFP(v) ((((v) - 1) << ESAI_xCCR_xFP_SHIFT) & ESAI_xCCR_xFP_MASK)
#define ESAI_xCCR_xDC_SHIFT 9
-#define ESAI_xCCR_xDC_WIDTH 4
+#define ESAI_xCCR_xDC_WIDTH 5
#define ESAI_xCCR_xDC_MASK (((1 << ESAI_xCCR_xDC_WIDTH) - 1) << ESAI_xCCR_xDC_SHIFT)
#define ESAI_xCCR_xDC(v) ((((v) - 1) << ESAI_xCCR_xDC_SHIFT) & ESAI_xCCR_xDC_MASK)
#define ESAI_xCCR_xPSR_SHIFT 8