diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-04 20:07:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-04 20:07:30 -0700 |
| commit | b742552ee23b9d526e69bf8edf0b705dc085e28e (patch) | |
| tree | fadf2bb5623472983427aebdb58ad11e2a23c42a | |
| parent | 0136ee2462404cfb0e458ffbd8f0d1c2cdb52678 (diff) | |
| parent | e90af32a6f8f3c4ed21286e18cd3773cb0a32fd7 (diff) | |
Merge "ASoC: msm: qdsp6v2: Add support for 7 channel mapping"
| -rw-r--r-- | sound/soc/msm/qdsp6v2/q6asm.c | 14 |
1 files changed, 14 insertions, 0 deletions
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; |