hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: sh: fsi: clean up SPDIF defines 

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2010-12-03 17:36:24 +09:00 committed by Mark Brown
parent c3acec2671
commit f7d711e3bb
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/sh/fsi.c
View File

@ -50,13 +50,20 @@
/* DO_FMT */ /* DO_FMT */
/* DI_FMT */ /* DI_FMT */
#define CR_BWS_24 (0x0 << 20) /* FSI2 */
#define CR_BWS_16 (0x1 << 20) /* FSI2 */
#define CR_BWS_20 (0x2 << 20) /* FSI2 */
#define CR_DTMD_PCM (0x0 << 8) /* FSI2 */
#define CR_DTMD_SPDIF_PCM (0x1 << 8) /* FSI2 */
#define CR_DTMD_SPDIF_STREAM (0x2 << 8) /* FSI2 */
#define CR_MONO (0x0 << 4) #define CR_MONO (0x0 << 4)
#define CR_MONO_D (0x1 << 4) #define CR_MONO_D (0x1 << 4)
#define CR_PCM (0x2 << 4) #define CR_PCM (0x2 << 4)
#define CR_I2S (0x3 << 4) #define CR_I2S (0x3 << 4)
#define CR_TDM (0x4 << 4) #define CR_TDM (0x4 << 4)
#define CR_TDM_D (0x5 << 4) #define CR_TDM_D (0x5 << 4)
#define CR_SPDIF 0x00100120
/* DOFF_CTL */ /* DOFF_CTL */
/* DIFF_CTL */ /* DIFF_CTL */
@ -93,6 +100,10 @@
#define IR (1 << 4) /* Interrupt Reset */ #define IR (1 << 4) /* Interrupt Reset */
#define FSISR (1 << 0) /* Software Reset */ #define FSISR (1 << 0) /* Software Reset */
/* OUT_SEL (FSI2) */
#define DMMD (1 << 4) /* SPDIF output timing 0: Biphase only */
/* 1: Biphase and serial */
/* FIFO_SZ */ /* FIFO_SZ */
#define FIFO_SZ_MASK 0x7 #define FIFO_SZ_MASK 0x7
@ -828,10 +839,10 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
dev_err(dai->dev, "This FSI can not use SPDIF\n"); dev_err(dai->dev, "This FSI can not use SPDIF\n");
return -EINVAL; return -EINVAL;
} }
data = CR_SPDIF; data = CR_BWS_16 | CR_DTMD_SPDIF_PCM | CR_PCM;
io->chan_num = 2; io->chan_num = 2;
fsi_spdif_clk_ctrl(fsi, 1); fsi_spdif_clk_ctrl(fsi, 1);
fsi_reg_mask_set(fsi, OUT_SEL, 0x0010, 0x0010); fsi_reg_mask_set(fsi, OUT_SEL, DMMD, DMMD);
break; break;
default: default:
dev_err(dai->dev, "unknown format.\n"); dev_err(dai->dev, "unknown format.\n");