Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf6fa77 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: Add support for 7 channel mapping"

parents 6adbc6fd 89b7f97b

sound/soc/msm/qdsp6v2/q6asm.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -3962,6 +3962,20 @@ static int q6asm_map_channels(u8 *channel_mapping, uint32_t channels, 
			PCM_CHANNEL_LB : PCM_CHANNEL_LS;

			PCM_CHANNEL_LB : PCM_CHANNEL_LS;

		lchannel_mapping[5] = use_back_flavor ?

		lchannel_mapping[5] = use_back_flavor ?

			PCM_CHANNEL_RB : PCM_CHANNEL_RS;

			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) {

	} else if (channels == 8) {

		lchannel_mapping[0] = PCM_CHANNEL_FL;

		lchannel_mapping[0] = PCM_CHANNEL_FL;

		lchannel_mapping[1] = PCM_CHANNEL_FR;

		lchannel_mapping[1] = PCM_CHANNEL_FR;