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

Commit 284ac3da authored by Revathi Uddaraju's avatar Revathi Uddaraju Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: qdsp6v2: Update device mapping for 7 channel 



Add support for adm 7 channel mapping.

CRs-Fixed: 1045949
Change-Id: I85b36357bbb097b79f417c11c947f3405f0ff7ef
Signed-off-by: default avatarRevathi Uddaraju <revathiu@codeaurora.org>
parent d3e41c96

sound/soc/msm/qdsp6v2/q6adm.c

+65 −52
Original line number Diff line number Diff line
@@ -2177,10 +2177,23 @@ int adm_arrange_mch_map(struct adm_cmd_device_open_v5 *open, int path, 
			 int channel_mode)

{

	int rc = 0, idx;



	memset(open->dev_channel_mapping, 0,

	memset(open->dev_channel_mapping, 0, PCM_FORMAT_MAX_NUM_CHANNEL);

	switch (path) {

	case ADM_PATH_PLAYBACK:

		idx = ADM_MCH_MAP_IDX_PLAYBACK;

		break;

	case ADM_PATH_LIVE_REC:

	case ADM_PATH_NONLIVE_REC:

		idx = ADM_MCH_MAP_IDX_REC;

		break;

	default:

		goto non_mch_path;

	};

	if ((open->dev_num_channel > 2) && multi_ch_maps[idx].set_channel_map) {

		memcpy(open->dev_channel_mapping,

			multi_ch_maps[idx].channel_mapping,

			PCM_FORMAT_MAX_NUM_CHANNEL);



	} else {

		if (channel_mode == 1) {

			open->dev_channel_mapping[0] = PCM_CHANNEL_FC;

		} else if (channel_mode == 2) {
@@ -2208,6 +2221,14 @@ int adm_arrange_mch_map(struct adm_cmd_device_open_v5 *open, int path, 
			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 == 7) {

			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[6] = PCM_CHANNEL_CS;

		} else if (channel_mode == 8) {

			open->dev_channel_mapping[0] = PCM_CHANNEL_FL;

			open->dev_channel_mapping[1] = PCM_CHANNEL_FR;
@@ -2223,23 +2244,7 @@ int adm_arrange_mch_map(struct adm_cmd_device_open_v5 *open, int path, 
			rc = -EINVAL;

			goto inval_ch_mod;

		}



	switch (path) {

	case ADM_PATH_PLAYBACK:

		idx = ADM_MCH_MAP_IDX_PLAYBACK;

		break;

	case ADM_PATH_LIVE_REC:

		idx = ADM_MCH_MAP_IDX_REC;

		break;

	default:

		goto non_mch_path;

		break;

	};



	if ((open->dev_num_channel > 2) && multi_ch_maps[idx].set_channel_map)

		memcpy(open->dev_channel_mapping,

		       multi_ch_maps[idx].channel_mapping,

		       PCM_FORMAT_MAX_NUM_CHANNEL);

	}



non_mch_path:

inval_ch_mod:
@@ -2281,6 +2286,14 @@ int adm_arrange_mch_ep2_map(struct adm_cmd_device_open_v6 *open_v6, 
		open_v6->dev_channel_mapping_eid2[3] = PCM_CHANNEL_FC;

		open_v6->dev_channel_mapping_eid2[4] = PCM_CHANNEL_LS;

		open_v6->dev_channel_mapping_eid2[5] = PCM_CHANNEL_RS;

	} else if (channel_mode == 7) {

		open_v6->dev_channel_mapping_eid2[0] = PCM_CHANNEL_FL;

		open_v6->dev_channel_mapping_eid2[1] = PCM_CHANNEL_FR;

		open_v6->dev_channel_mapping_eid2[2] = PCM_CHANNEL_FC;

		open_v6->dev_channel_mapping_eid2[3] = PCM_CHANNEL_LFE;

		open_v6->dev_channel_mapping_eid2[4] = PCM_CHANNEL_LB;

		open_v6->dev_channel_mapping_eid2[5] = PCM_CHANNEL_RB;

		open_v6->dev_channel_mapping_eid2[6] = PCM_CHANNEL_CS;

	} else if (channel_mode == 8) {

		open_v6->dev_channel_mapping_eid2[0] = PCM_CHANNEL_FL;

		open_v6->dev_channel_mapping_eid2[1] = PCM_CHANNEL_FR;