From 9f2572ec7f4787b166f82e99c73ffd0bfce0d8c2 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Tue, 10 Oct 2017 10:40:23 +0800 Subject: [PATCH] video: rockchip: hdmi: enable nlpcm audio case Change-Id: I21034b9053c171c3503054c4b23d67b11a7f430a Signed-off-by: Sugar Zhang --- drivers/video/rockchip/hdmi/rockchip-hdmi-core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c index 074f6d21626e..91cbd9ac5946 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c @@ -3,6 +3,9 @@ #include "rockchip-hdmi.h" #include "rockchip-hdmi-cec.h" +#define HW_PARAMS_FLAG_LPCM 0 +#define HW_PARAMS_FLAG_NLPCM 1 + struct hdmi_delayed_work { struct delayed_work work; struct hdmi *hdmi; @@ -779,12 +782,10 @@ int snd_config_hdmi_audio(struct snd_pcm_hw_params *params) audio_cfg.rate = rate; - /* - *if (params->flags == HW_PARAMS_FLAG_NLPCM) - * audio_cfg.type = HDMI_AUDIO_NLPCM; - *else - */ - audio_cfg.type = HDMI_AUDIO_LPCM; + if (params->flags == HW_PARAMS_FLAG_NLPCM) + audio_cfg.type = HDMI_AUDIO_NLPCM; + else + audio_cfg.type = HDMI_AUDIO_LPCM; audio_cfg.channel = params_channels(params); audio_cfg.word_length = HDMI_AUDIO_WORD_LENGTH_16bit;