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

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

Merge "asoc: Add new channel ID to mark unused channel map slots"

parents 9728ee85 49c325c6

asoc/msm-compress-q6-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -4082,8 +4082,8 @@ static int msm_compr_channel_map_info(struct snd_kcontrol *kcontrol, 
	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = PCM_FORMAT_MAX_NUM_CHANNEL_V8;

	uinfo->value.integer.min = 0;

	/* See PCM_CHANNEL_RSD=34 in apr_audio-v2.h */

	uinfo->value.integer.max = 34;

	/* See PCM_CHANNEL_UNUSED=47 in apr_audio-v2.h */

	uinfo->value.integer.max = 47;

	return 0;

}

asoc/msm-qti-pp-config.c

+1 −1
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ static const struct snd_kcontrol_new sec_auxpcm_lb_vol_mixer_controls[] = { 
};



static const struct snd_kcontrol_new multi_ch_channel_map_mixer_controls[] = {

	SOC_SINGLE_MULTI_EXT("Playback Device Channel Map", SND_SOC_NOPM, 0, 34,

	SOC_SINGLE_MULTI_EXT("Playback Device Channel Map", SND_SOC_NOPM, 0, 47,

	0, PCM_FORMAT_MAX_NUM_CHANNEL_V8, msm_qti_pp_get_channel_map_mixer,

	msm_qti_pp_put_channel_map_mixer),

};