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

Commit f4dac5b2 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: update default channel mapping"

parents 5e7638d1 9f83604e

sound/soc/msm/qdsp6v2/q6adm.c

+6 −6
Original line number Diff line number Diff line
@@ -1237,10 +1237,10 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 
		} else if (channel_mode == 6) {

			open.dev_channel_mapping[0] = PCM_CHANNEL_FL;

			open.dev_channel_mapping[1] = PCM_CHANNEL_FR;

			open.dev_channel_mapping[2] = PCM_CHANNEL_FC;

			open.dev_channel_mapping[3] = PCM_CHANNEL_LFE;

			open.dev_channel_mapping[4] = PCM_CHANNEL_LB;

			open.dev_channel_mapping[5] = PCM_CHANNEL_RB;

			open.dev_channel_mapping[2] = PCM_CHANNEL_LFE;

			open.dev_channel_mapping[3] = PCM_CHANNEL_FC;

			open.dev_channel_mapping[4] = PCM_CHANNEL_LS;

			open.dev_channel_mapping[5] = PCM_CHANNEL_RS;

		} else if (channel_mode == 8) {

			open.dev_channel_mapping[0] = PCM_CHANNEL_FL;

			open.dev_channel_mapping[1] = PCM_CHANNEL_FR;
@@ -1248,8 +1248,8 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 
			open.dev_channel_mapping[3] = PCM_CHANNEL_FC;

			open.dev_channel_mapping[4] = PCM_CHANNEL_LB;

			open.dev_channel_mapping[5] = PCM_CHANNEL_RB;

			open.dev_channel_mapping[6] = PCM_CHANNEL_RLC;

			open.dev_channel_mapping[7] = PCM_CHANNEL_RRC;

			open.dev_channel_mapping[6] = PCM_CHANNEL_FLC;

			open.dev_channel_mapping[7] = PCM_CHANNEL_FRC;

		} else {

			pr_err("%s invalid num_chan %d\n", __func__,

					channel_mode);

sound/soc/msm/qdsp6v2/q6asm.c

+10 −10
Original line number Diff line number Diff line
@@ -2276,21 +2276,21 @@ static int q6asm_map_channels(u8 *channel_mapping, uint32_t channels) 
		lchannel_mapping[3] = PCM_CHANNEL_LB;

		lchannel_mapping[4] = PCM_CHANNEL_RB;

	} else if (channels == 6) {

		lchannel_mapping[0] = PCM_CHANNEL_FC;

		lchannel_mapping[1] = PCM_CHANNEL_FL;

		lchannel_mapping[2] = PCM_CHANNEL_FR;

		lchannel_mapping[3] = PCM_CHANNEL_LB;

		lchannel_mapping[4] = PCM_CHANNEL_RB;

		lchannel_mapping[5] = PCM_CHANNEL_LFE;

		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] = PCM_CHANNEL_LS;

		lchannel_mapping[5] = PCM_CHANNEL_RS;

	} else if (channels == 8) {

		lchannel_mapping[0] = PCM_CHANNEL_FL;

		lchannel_mapping[1] = PCM_CHANNEL_FR;

		lchannel_mapping[2] = PCM_CHANNEL_LFE;

		lchannel_mapping[3] = PCM_CHANNEL_FC;

		lchannel_mapping[2] = PCM_CHANNEL_FC;

		lchannel_mapping[3] = PCM_CHANNEL_LFE;

		lchannel_mapping[4] = PCM_CHANNEL_LB;

		lchannel_mapping[5] = PCM_CHANNEL_RB;

		lchannel_mapping[6] = PCM_CHANNEL_RLC;

		lchannel_mapping[7] = PCM_CHANNEL_RRC;

		lchannel_mapping[6] = PCM_CHANNEL_FLC;

		lchannel_mapping[7] = PCM_CHANNEL_FRC;

	} else {

		pr_err("%s: ERROR.unsupported num_ch = %u\n",

		 __func__, channels);