Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next

git-mirror · Dec 2, 2012 · 546694b · 546694b
2 parents 9557656 + 3449f5f
commit 546694b
Show file tree

Hide file tree

Showing 2 changed files with 487 additions and 69 deletions.
diff --git 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
  *