aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-12-17 01:12:55 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-24 10:57:20 -0500
commit5d0bfc5eb9f57b319d7cd6a1d5543c8287c77812 (patch)
treefba20502aaf8d54b94d0a07371e9bacd4c3990d6 /include/sound
parentabca75814a82c0c53c0a8ec7fa1300c133bc4f01 (diff)
ASoC: fsi: cleanup sh_fsi.h
FSI driver's flag usage was changed/removed by 3449f5fab8c51e37a8a48bc2516588c615373191 (ASoC: fsi: add SND_SOC_DAIFMT_INV_xxx support) ab6f6d85210c4d0265cf48e9958c04e08595055a (ASoC: fsi: add master clock control functions) And unused flags had been removed on FSI driver, but the definition had been kept to avoid compile error. It is possible to cleanup sh_fsi.h now. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/sh_fsi.h30
1 files changed, 4 insertions, 26 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index 43ac28581920..7a9710b4b799 100644
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -11,37 +11,15 @@
11 * it under the terms of the GNU General Public License version 2 as 11 * it under the terms of the GNU General Public License version 2 as
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 */ 13 */
14
15#define FSI_PORT_A 0
16#define FSI_PORT_B 1
17
18#include <linux/clk.h> 14#include <linux/clk.h>
19#include <sound/soc.h> 15#include <sound/soc.h>
20 16
21/* 17/*
22 * flags format 18 * flags
23 *
24 * 0x00000CBA
25 *
26 * A: inversion
27 * B: format mode
28 * C: chip specific
29 * D: clock selecter if master mode
30 */ 19 */
31 20#define SH_FSI_FMT_SPDIF (1 << 0) /* spdif for HDMI */
32/* B: format mode */ 21#define SH_FSI_ENABLE_STREAM_MODE (1 << 1) /* for 16bit data */
33#define SH_FSI_FMT_MASK 0x000000F0 22#define SH_FSI_CLK_CPG (1 << 2) /* FSIxCK + FSI-DIV */
34#define SH_FSI_FMT_DAI (0 << 4)
35#define SH_FSI_FMT_SPDIF (1 << 4)
36
37/* C: chip specific */
38#define SH_FSI_OPTION_MASK 0x00000F00
39#define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */
40
41/* D: clock selecter if master mode */
42#define SH_FSI_CLK_MASK 0x0000F000
43#define SH_FSI_CLK_EXTERNAL (0 << 12)
44#define SH_FSI_CLK_CPG (1 << 12) /* FSIxCK + FSI-DIV */
45 23
46struct sh_fsi_port_info { 24struct sh_fsi_port_info {
47 unsigned long flags; 25 unsigned long flags;