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

Commit dbe7c21a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: routing: Extend MultiMedia1 channel controls to support 14channels"

parents 1c7c420c 6790e928

asoc/msm-pcm-routing-v2.c

+41 −1
Original line number Diff line number Diff line
@@ -3760,7 +3760,7 @@ static const struct snd_kcontrol_new channel_mixer_controls[] = { 
			msm_pcm_put_channel_rule_index),















	SOC_SINGLE_EXT("MultiMedia1 Channels", SND_SOC_NOPM,













			MSM_FRONTEND_DAI_MULTIMEDIA1, 10, 0,













			MSM_FRONTEND_DAI_MULTIMEDIA1, 14, 0,















			msm_pcm_get_out_chs,















			msm_pcm_put_out_chs),















	SOC_SINGLE_EXT("MultiMedia2 Channels", SND_SOC_NOPM,










@@ -3922,6 +3922,46 @@ static const struct snd_kcontrol_new channel_mixer_controls[] = {













	{















	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,















	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,













	.name = "MultiMedia1 Output Channel11",













	.info = msm_pcm_channel_weight_info,













	.get = msm_pcm_channel_weight_get,













	.put = msm_pcm_channel_weight_put,













	.private_value = (unsigned long)&(struct soc_multi_mixer_control)













		{ .shift = MSM_FRONTEND_DAI_MULTIMEDIA1, .rshift = 10,}













	},













	{













	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,













	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,













	.name = "MultiMedia1 Output Channel12",













	.info = msm_pcm_channel_weight_info,













	.get = msm_pcm_channel_weight_get,













	.put = msm_pcm_channel_weight_put,













	.private_value = (unsigned long)&(struct soc_multi_mixer_control)













		{ .shift = MSM_FRONTEND_DAI_MULTIMEDIA1, .rshift = 11,}













	},













	{













	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,













	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,













	.name = "MultiMedia1 Output Channel13",













	.info = msm_pcm_channel_weight_info,













	.get = msm_pcm_channel_weight_get,













	.put = msm_pcm_channel_weight_put,













	.private_value = (unsigned long)&(struct soc_multi_mixer_control)













		{ .shift = MSM_FRONTEND_DAI_MULTIMEDIA1, .rshift = 12,}













	},













	{













	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,













	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,













	.name = "MultiMedia1 Output Channel14",













	.info = msm_pcm_channel_weight_info,













	.get = msm_pcm_channel_weight_get,













	.put = msm_pcm_channel_weight_put,













	.private_value = (unsigned long)&(struct soc_multi_mixer_control)













		{ .shift = MSM_FRONTEND_DAI_MULTIMEDIA1, .rshift = 13,}













	},













	{













	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,













	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,















	.name = "MultiMedia2 Output Channel1",















	.info = msm_pcm_channel_weight_info,















	.get = msm_pcm_channel_weight_get,