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

954f497f · Mark Brown · 1870975f · 3449f5fa · 954f497f · 954f497f
Commit 954f497f authored Dec 10, 2012 by Mark Brown
Expand all Show whitespace changes
Inline Side-by-side

Showing with 487 additions and 69 deletions

include/sound/sh_fsi.h include/sound/sh_fsi.h +6 -0

sound/soc/sh/fsi.c sound/soc/sh/fsi.c +481 -69

No files found.
--- 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
 *

--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c