Skip to content

Commit

Permalink
ASoC: fsi: cleanup sh_fsi.h
Browse files Browse the repository at this point in the history
FSI driver's flag usage was changed/removed by
3449f5f
(ASoC: fsi: add SND_SOC_DAIFMT_INV_xxx support)
ab6f6d8
(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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Dec 24, 2012
1 parent abca758 commit 5d0bfc5
Showing 1 changed file with 4 additions and 26 deletions.
30 changes: 4 additions & 26 deletions include/sound/sh_fsi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5d0bfc5

Please sign in to comment.