diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:04 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:04 -0500 |
| commit | 546694bc42a4ee4f1a5d2f14e1c71d11fdafba4d (patch) | |
| tree | 15767d995eb0b5867bb6f13655be696c68b44d13 /include | |
| parent | 9557656200d685a6e92fb09c8d26ef7d7ba27026 (diff) | |
| parent | 3449f5fab8c51e37a8a48bc2516588c615373191 (diff) | |
Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/sh_fsi.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index 906010344dd7..cc1c919c6436 100644 --- a/include/sound/sh_fsi.h +++ b/include/sound/sh_fsi.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * A: inversion | 26 | * A: inversion |
| 27 | * B: format mode | 27 | * B: format mode |
| 28 | * C: chip specific | 28 | * C: chip specific |
| 29 | * D: clock selecter if master mode | ||
| 29 | */ | 30 | */ |
| 30 | 31 | ||
| 31 | /* A: clock inversion */ | 32 | /* A: clock inversion */ |
| @@ -44,6 +45,11 @@ | |||
| 44 | #define SH_FSI_OPTION_MASK 0x00000F00 | 45 | #define SH_FSI_OPTION_MASK 0x00000F00 |
| 45 | #define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */ | 46 | #define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */ |
| 46 | 47 | ||
| 48 | /* D: clock selecter if master mode */ | ||
| 49 | #define SH_FSI_CLK_MASK 0x0000F000 | ||
| 50 | #define SH_FSI_CLK_EXTERNAL (0 << 12) | ||
| 51 | #define SH_FSI_CLK_CPG (1 << 12) /* FSIxCK + FSI-DIV */ | ||
| 52 | |||
| 47 | /* | 53 | /* |
| 48 | * set_rate return value | 54 | * set_rate return value |
| 49 | * | 55 | * |