summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-22 02:58:55 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-22 02:58:55 +0200
commit85e184e4c3cd3e2285ceab91ff8f0cac094e8a85 (patch)
tree1c1cf2d82a62bf0bef4ee390f578dcec35f4b427 /include/sound
parent382e6a859e6622de0aa62c01976ae8ebd90e986d (diff)
parent766812e6d5e2e23be1e212cf84902d5e834dd865 (diff)
downloadop-kernel-dev-85e184e4c3cd3e2285ceab91ff8f0cac094e8a85.zip
op-kernel-dev-85e184e4c3cd3e2285ceab91ff8f0cac094e8a85.tar.gz
Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Last minute updates These are all new code, they've been in -next already so should be OK for merge this time round. I'd been planning to send a pull request today after they'd had a bit of exposure there to make sure breakage didn't propagate into your tree.
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/sh_fsi.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index 956e30e..9060103 100644
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -21,10 +21,11 @@
/*
* flags format
*
- * 0x000000BA
+ * 0x00000CBA
*
* A: inversion
* B: format mode
+ * C: chip specific
*/
/* A: clock inversion */
@@ -39,6 +40,9 @@
#define SH_FSI_FMT_DAI (0 << 4)
#define SH_FSI_FMT_SPDIF (1 << 4)
+/* C: chip specific */
+#define SH_FSI_OPTION_MASK 0x00000F00
+#define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */
/*
* set_rate return value
OpenPOWER on IntegriCloud