summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:08 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:08 +0900
commit954f497f7167de273b6e062de84689ccd8bf999d (patch)
tree73dd01cf9526c79956d58a30a7da3441e457fe23 /include
parent1870975f5db15fc30c8c025665fbc86ecb1fffd9 (diff)
parent3449f5fab8c51e37a8a48bc2516588c615373191 (diff)
downloadlinux-3.10-954f497f7167de273b6e062de84689ccd8bf999d.tar.gz
linux-3.10-954f497f7167de273b6e062de84689ccd8bf999d.tar.bz2
linux-3.10-954f497f7167de273b6e062de84689ccd8bf999d.zip
Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next
Diffstat (limited to 'include')
-rw-r--r--include/sound/sh_fsi.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index 906010344dd..cc1c919c643 100644
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -26,6 +26,7 @@
* A: inversion
* B: format mode
* C: chip specific
+ * D: clock selecter if master mode
*/
/* A: clock inversion */
@@ -44,6 +45,11 @@
#define SH_FSI_OPTION_MASK 0x00000F00
#define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */
+/* D: clock selecter if master mode */
+#define SH_FSI_CLK_MASK 0x0000F000
+#define SH_FSI_CLK_EXTERNAL (0 << 12)
+#define SH_FSI_CLK_CPG (1 << 12) /* FSIxCK + FSI-DIV */
+
/*
* set_rate return value
*