From 49c325c69f2a258fa0e9b75bfb234c75ef7491a9 Mon Sep 17 00:00:00 2001 From: Ralf Herz Date: Thu, 20 Dec 2018 11:23:22 +0100 Subject: [PATCH] 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 --- asoc/msm-compress-q6-v2.c | 4 ++-- asoc/msm-qti-pp-config.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asoc/msm-compress-q6-v2.c b/asoc/msm-compress-q6-v2.c index 4b77fbd6744e..be10bc1690fc 100644 --- a/asoc/msm-compress-q6-v2.c +++ b/asoc/msm-compress-q6-v2.c @@ -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; } diff --git a/asoc/msm-qti-pp-config.c b/asoc/msm-qti-pp-config.c index 222a3a953236..ee67e83aa91f 100644 --- a/asoc/msm-qti-pp-config.c +++ b/asoc/msm-qti-pp-config.c @@ -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 @@ -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), };