From e90af32a6f8f3c4ed21286e18cd3773cb0a32fd7 Mon Sep 17 00:00:00 2001 From: Rohit Kumar Date: Tue, 14 Feb 2017 12:15:45 +0530 Subject: [PATCH] ASoC: msm: qdsp6v2: Add support for 7 channel mapping Add support for 7 channel mapping in asm to support 7 channel playback. CRs-Fixed: 1114041 Change-Id: I0daf306d4495d3966406d05fc6328b2956a2d11f Signed-off-by: Rohit Kumar --- sound/soc/msm/qdsp6v2/q6asm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/msm/qdsp6v2/q6asm.c b/sound/soc/msm/qdsp6v2/q6asm.c index 1ca99c3f9115..731f439f5286 100644 --- a/sound/soc/msm/qdsp6v2/q6asm.c +++ b/sound/soc/msm/qdsp6v2/q6asm.c @@ -4300,6 +4300,20 @@ static int q6asm_map_channels(u8 *channel_mapping, uint32_t channels, PCM_CHANNEL_LB : PCM_CHANNEL_LS; lchannel_mapping[5] = use_back_flavor ? PCM_CHANNEL_RB : PCM_CHANNEL_RS; + } else if (channels == 7) { + /* + * Configured for 5.1 channel mapping + 1 channel for debug + * Can be customized based on DSP. + */ + lchannel_mapping[0] = PCM_CHANNEL_FL; + lchannel_mapping[1] = PCM_CHANNEL_FR; + lchannel_mapping[2] = PCM_CHANNEL_FC; + lchannel_mapping[3] = PCM_CHANNEL_LFE; + lchannel_mapping[4] = use_back_flavor ? + PCM_CHANNEL_LB : PCM_CHANNEL_LS; + lchannel_mapping[5] = use_back_flavor ? + PCM_CHANNEL_RB : PCM_CHANNEL_RS; + lchannel_mapping[6] = PCM_CHANNEL_CS; } else if (channels == 8) { lchannel_mapping[0] = PCM_CHANNEL_FL; lchannel_mapping[1] = PCM_CHANNEL_FR;