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>

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>
Kuninori Morimoto · Mark Brown
1 parent abca75814a
Showing 1 changed file with 4 additions and 26 deletions Side-by-side Diff
include/sound/sh_fsi.h
@@ -11,37 +11,15 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
-#define FSI_PORT_A	0
-#define FSI_PORT_B	1
-
 #include <linux/clk.h>
 #include <sound/soc.h>
  
 /*
- * flags format
- *
- * 0x00000CBA
- *
- * A:  inversion
- * B:  format mode
- * C:  chip specific
- * D:  clock selecter if master mode
+ * flags
  */
-
-/* B: format mode */
-#define SH_FSI_FMT_MASK		0x000000F0
-#define SH_FSI_FMT_DAI		(0 << 4)
-#define SH_FSI_FMT_SPDIF	(1 << 4)
-
-/* C: chip specific */
-#define SH_FSI_OPTION_MASK	0x00000F00
-#define SH_FSI_ENABLE_STREAM_MODE	(1 << 8) /* for 16bit data */
-
-/* D:  clock selecter if master mode */
-#define SH_FSI_CLK_MASK		0x0000F000
-#define SH_FSI_CLK_EXTERNAL	(0 << 12)
-#define SH_FSI_CLK_CPG		(1 << 12) /* FSIxCK + FSI-DIV */
+#define SH_FSI_FMT_SPDIF		(1 << 0) /* spdif for HDMI */
+#define SH_FSI_ENABLE_STREAM_MODE	(1 << 1) /* for 16bit data */
+#define SH_FSI_CLK_CPG			(1 << 2) /* FSIxCK + FSI-DIV */
  
 struct sh_fsi_port_info {
 	unsigned long flags;
...	...	@@ -11,37 +11,15 @@
11	11	* it under the terms of the GNU General Public License version 2 as
12	12	* published by the Free Software Foundation.
13	13	*/
14		-
15		-#define FSI_PORT_A 0
16		-#define FSI_PORT_B 1
17		-
18	14	#include <linux/clk.h>
19	15	#include <sound/soc.h>
20	16
21	17	/*
22		- * flags format
23		- *
24		- * 0x00000CBA
25		- *
26		- * A: inversion
27		- * B: format mode
28		- * C: chip specific
29		- * D: clock selecter if master mode
	18	+ * flags
30	19	*/
31		-
32		-/* B: format mode */
33		-#define SH_FSI_FMT_MASK 0x000000F0
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 */
	20	+#define SH_FSI_FMT_SPDIF (1 << 0) /* spdif for HDMI */
	21	+#define SH_FSI_ENABLE_STREAM_MODE (1 << 1) /* for 16bit data */
	22	+#define SH_FSI_CLK_CPG (1 << 2) /* FSIxCK + FSI-DIV */
45	23
46	24	struct sh_fsi_port_info {
47	25	unsigned long flags;