mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 07:03:09 -04:00
asoc: Add new channel ID to mark unused channel map slots
Allow to mark entries in a channel map as unused to prevent mixing other channels in that slot. Change-Id: Iefbfb861b796129211e929cb0ddb84041b9f57b0 Signed-off-by: Ralf Herz <rherz@codeaurora.org>
This commit is contained in:
parent
fb81b6e796
commit
49c325c69f
2 changed files with 4 additions and 4 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
|
||||
/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/err.h>
|
||||
|
|
@ -1406,7 +1406,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),
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue