diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-01-19 21:46:02 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-21 14:01:47 -0500 |
commit | 4d805f7b6607f6e547dc22e5d57c201e43d21c05 (patch) | |
tree | 41ce090f7f9f3f4cc76e74101a108218da447f62 /include/sound | |
parent | 0d032c19e764ad2f60292f58116f6c2a052a58ab (diff) |
ASoC: sh: fsi: Add snd_soc_dai_set_fmt support
This patch add snd_soc_dai_ops :: set_fmt to FSI driver and
select master/slave clock mode by snd_soc_dai_set_fmt on
fsi-xxx.c instead of platform infomation code.
This patch remove fsi_is_master function which is no longer needed.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/sh_fsi.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index d79894192ae3..18e43279f70f 100644 --- a/include/sound/sh_fsi.h +++ b/include/sound/sh_fsi.h | |||
@@ -17,12 +17,11 @@ | |||
17 | 17 | ||
18 | /* flags format | 18 | /* flags format |
19 | 19 | ||
20 | * 0xABCDEEFF | 20 | * 0xABC0EEFF |
21 | * | 21 | * |
22 | * A: channel size for TDM (input) | 22 | * A: channel size for TDM (input) |
23 | * B: channel size for TDM (ooutput) | 23 | * B: channel size for TDM (ooutput) |
24 | * C: inversion | 24 | * C: inversion |
25 | * D: mode | ||
26 | * E: input format | 25 | * E: input format |
27 | * F: output format | 26 | * F: output format |
28 | */ | 27 | */ |
@@ -46,11 +45,6 @@ | |||
46 | #define SH_FSI_LRS_INV (1 << 22) | 45 | #define SH_FSI_LRS_INV (1 << 22) |
47 | #define SH_FSI_BRS_INV (1 << 23) | 46 | #define SH_FSI_BRS_INV (1 << 23) |
48 | 47 | ||
49 | /* mode */ | ||
50 | #define SH_FSI_MODE_MASK 0x000F0000 | ||
51 | #define SH_FSI_IN_SLAVE_MODE (1 << 16) /* default master mode */ | ||
52 | #define SH_FSI_OUT_SLAVE_MODE (1 << 17) /* default master mode */ | ||
53 | |||
54 | /* DI format */ | 48 | /* DI format */ |
55 | #define SH_FSI_FMT_MASK 0x000000FF | 49 | #define SH_FSI_FMT_MASK 0x000000FF |
56 | #define SH_FSI_IFMT(x) (((SH_FSI_FMT_ ## x) & SH_FSI_FMT_MASK) << 8) | 50 | #define SH_FSI_IFMT(x) (((SH_FSI_FMT_ ## x) & SH_FSI_FMT_MASK) << 8) |