aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-01-20 11:46:02 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-21 19:01:47 +0000
commit4d805f7b6607f6e547dc22e5d57c201e43d21c05 (patch)
tree41ce090f7f9f3f4cc76e74101a108218da447f62 /include/sound
parent0d032c19e764ad2f60292f58116f6c2a052a58ab (diff)
downloadkernel_samsung_smdk4412-4d805f7b6607f6e547dc22e5d57c201e43d21c05.zip
kernel_samsung_smdk4412-4d805f7b6607f6e547dc22e5d57c201e43d21c05.tar.gz
kernel_samsung_smdk4412-4d805f7b6607f6e547dc22e5d57c201e43d21c05.tar.bz2
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.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index d798941..18e4327 100644
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -17,12 +17,11 @@
/* flags format
- * 0xABCDEEFF
+ * 0xABC0EEFF
*
* A: channel size for TDM (input)
* B: channel size for TDM (ooutput)
* C: inversion
- * D: mode
* E: input format
* F: output format
*/
@@ -46,11 +45,6 @@
#define SH_FSI_LRS_INV (1 << 22)
#define SH_FSI_BRS_INV (1 << 23)
-/* mode */
-#define SH_FSI_MODE_MASK 0x000F0000
-#define SH_FSI_IN_SLAVE_MODE (1 << 16) /* default master mode */
-#define SH_FSI_OUT_SLAVE_MODE (1 << 17) /* default master mode */
-
/* DI format */
#define SH_FSI_FMT_MASK 0x000000FF
#define SH_FSI_IFMT(x) (((SH_FSI_FMT_ ## x) & SH_FSI_FMT_MASK) << 8)