提交 f808a9e3 编写于 作者: D Dmitri Belimov 提交者: Mauro Carvalho Chehab

V4L/DVB (7976): I2S on for MPEG of saa7134_empress

Rework saa7134_enable_i2s function. Add vendor specific data.
Add definition for I2S audio output control register.
Signed-off-by: NBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 53af158a
...@@ -353,6 +353,7 @@ ...@@ -353,6 +353,7 @@
/* I2S output */ /* I2S output */
#define SAA7134_I2S_AUDIO_OUTPUT 0x1c0 #define SAA7134_I2S_AUDIO_OUTPUT 0x1c0
#define SAA7134_I2S_AUDIO_CONTROL 0x591
/* test modes */ /* test modes */
#define SAA7134_SPECIAL_MODE 0x1d0 #define SAA7134_SPECIAL_MODE 0x1d0
......
...@@ -873,13 +873,25 @@ void saa7134_enable_i2s(struct saa7134_dev *dev) ...@@ -873,13 +873,25 @@ void saa7134_enable_i2s(struct saa7134_dev *dev)
if (!card_is_empress(dev)) if (!card_is_empress(dev))
return; return;
i2s_format = (dev->input->amux == TV) ? 0x00 : 0x01;
/* enable I2S audio output for the mpeg encoder */ switch (dev->board) {
saa_writeb(SAA7134_I2S_OUTPUT_SELECT, 0x80); case SAA7134_BOARD_BEHOLD_M6:
saa_writeb(SAA7134_I2S_OUTPUT_FORMAT, i2s_format); /* configure GPIO for out audio */
saa_writeb(SAA7134_I2S_OUTPUT_LEVEL, 0x0F); saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x0E000000, 0x00000000);
saa_writeb(SAA7134_I2S_AUDIO_OUTPUT, 0x01); /* Set I2S format */
saa_writeb(SAA7134_I2S_AUDIO_CONTROL, 0x00);
/* Start I2S */
saa_writeb(SAA7134_I2S_AUDIO_OUTPUT, 0x11);
break;
default:
i2s_format = (dev->input->amux == TV) ? 0x00 : 0x01;
/* enable I2S audio output for the mpeg encoder */
saa_writeb(SAA7134_I2S_OUTPUT_SELECT, 0x80);
saa_writeb(SAA7134_I2S_OUTPUT_FORMAT, i2s_format);
saa_writeb(SAA7134_I2S_OUTPUT_LEVEL, 0x0F);
saa_writeb(SAA7134_I2S_AUDIO_OUTPUT, 0x01);
}
} }
int saa7134_tvaudio_rx2mode(u32 rx) int saa7134_tvaudio_rx2mode(u32 rx)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册