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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user