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.
Showing the changes to include (1 of 10 files). Show all
Unified · Split
| @@ -21,10 +21,11 @@ · 20 unmodified lines | ||
| 21 | 21 | /* |
| 22 | 22 | * flags format |
| 23 | 23 | * |
| 24 | − * 0x000000BA | |
| 24 | + * 0x00000CBA | |
| 25 | 25 | * |
| 26 | 26 | * A: inversion |
| 27 | 27 | * B: format mode |
| 28 | + * C: chip specific | |
| 28 | 29 | */ |
| 29 | 30 | |
| 30 | 31 | /* A: clock inversion */ |
| @@ -39,6 +40,9 @@ · 8 unmodified lines | ||
| 39 | 40 | #define SH_FSI_FMT_DAI (0 << 4) |
| 40 | 41 | #define SH_FSI_FMT_SPDIF (1 << 4) |
| 41 | 42 | |
| 43 | +/* C: chip specific */ | |
| 44 | +#define SH_FSI_OPTION_MASK 0x00000F00 | |
| 45 | +#define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */ | |
| 42 | 46 | |
| 43 | 47 | /* |
| 44 | 48 | * set_rate return value |