shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

hdmi: hdmiv1:

Browse Source 
For nlpcm bitstream mode, we need to set audio
	channel status nlpcm bit to 1.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-02-14 09:14:18 +08:00
parent f4fed0d820
commit faf8120fc8
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/rockchip/hdmi/rockchip-hdmiv1/rockchip_hdmiv1_hw.c
View File

@@ -796,6 +796,15 @@ static int rockchip_hdmiv1_config_audio(struct hdmi *hdmi_drv,
hdmi_writel(hdmi_dev, AUDIO_N_H, (N >> 16) & 0x0F);
hdmi_writel(hdmi_dev, AUDIO_N_M, (N >> 8) & 0xFF);
hdmi_writel(hdmi_dev, AUDIO_N_L, N & 0xFF);
/*Set hdmi nlpcm mode to support hdmi bitstream*/
if (audio->type == HDMI_AUDIO_NLPCM)
hdmi_writel(hdmi_dev, AUDIO_CHANNEL_STATUS,
v_AUDIO_STATUS_NLPCM(1));
else
hdmi_writel(hdmi_dev, AUDIO_CHANNEL_STATUS,
v_AUDIO_STATUS_NLPCM(0));
rockchip_hdmiv1_config_aai(hdmi_drv);
return 0;

8
drivers/video/rockchip/hdmi/rockchip-hdmiv1/rockchip_hdmiv1_hw.h
View File

@@ -235,6 +235,14 @@ enum {
#define N_96K 0x3000
#define N_192K 0x6000
#define AUDIO_CHANNEL_STATUS 0x3e
#define m_AUDIO_STATUS_NLPCM (1 << 7)
#define m_AUDIO_STATUS_USE (1 << 6)
#define m_AUDIO_STATUS_COPYRIGHT (1 << 5)
#define m_AUDIO_STATUS_ADDITION (3 << 2)
#define m_AUDIO_STATUS_CLK_ACCURACY (2 << 0)
#define v_AUDIO_STATUS_NLPCM(n) ((n & 1) << 7)
#define AUDIO_N_H 0x3f
#define AUDIO_N_M 0x40
#define AUDIO_N_L 0x41