Merge "asoc: add support for custom channel map"

asoc/msm-compress-q6-v2.c

@@ -4171,8 +4171,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_UNUSED=47 in apr_audio-v2.h */
-	uinfo->value.integer.max = 47;
+	/* See PCM_MAX_CHANNEL_MAP in apr_audio-v2.h */
+	uinfo->value.integer.max = PCM_MAX_CHANNEL_MAP;
 	return 0;
 }
 

include/dsp/apr_audio-v2.h

@@ -5671,6 +5671,24 @@ struct asm_softvolume_params {
 /* Mark unused channel. */
 #define PCM_CHANNEL_UNUSED  47
 
+#define PCM_CUSTOM_CHANNEL_MAP_1   48
+#define PCM_CUSTOM_CHANNEL_MAP_2   49
+#define PCM_CUSTOM_CHANNEL_MAP_3   50
+#define PCM_CUSTOM_CHANNEL_MAP_4   51
+#define PCM_CUSTOM_CHANNEL_MAP_5   52
+#define PCM_CUSTOM_CHANNEL_MAP_6   53
+#define PCM_CUSTOM_CHANNEL_MAP_7   54
+#define PCM_CUSTOM_CHANNEL_MAP_8   55
+#define PCM_CUSTOM_CHANNEL_MAP_9   56
+#define PCM_CUSTOM_CHANNEL_MAP_10  57
+#define PCM_CUSTOM_CHANNEL_MAP_11  58
+#define PCM_CUSTOM_CHANNEL_MAP_12  59
+#define PCM_CUSTOM_CHANNEL_MAP_13  60
+#define PCM_CUSTOM_CHANNEL_MAP_14  61
+#define PCM_CUSTOM_CHANNEL_MAP_15  62
+#define PCM_CUSTOM_CHANNEL_MAP_16  63
+#define PCM_MAX_CHANNEL_MAP   63
+
 /* Max valid channel map index */
 #define PCM_MAX_CHMAP_ID PCM_CHANNEL_RSD