Merge "asoc: msm-pcm-routing: add Listen app type config v2 mixer control" (dd85796f) · Commits · e / devices / android_kernel_oneplus_sm8150

asoc/msm-pcm-routing-v2.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -14826,16 +14826,20 @@ static int msm_routing_put_lsm_app_type_cfg_control(
		struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		int shift = ((struct soc_multi_mixer_control *)
		kcontrol->private_value)->shift;
		int i = 0, j;
		int num_app_types = ucontrol->value.integer.value[i++];

		memset(lsm_app_type_cfg, 0, MAX_APP_TYPES*
		sizeof(struct msm_pcm_routing_app_type_data));

		if (num_app_types > MAX_APP_TYPES) {
		pr_err("%s: number of app types exceed the max supported\n",
		__func__);
		return -EINVAL;
		}

		for (j = 0; j < num_app_types; j++) {
		lsm_app_type_cfg[j].app_type =
		ucontrol->value.integer.value[i++];
		@@ -14843,6 +14847,10 @@ static int msm_routing_put_lsm_app_type_cfg_control(
		ucontrol->value.integer.value[i++];
		lsm_app_type_cfg[j].bit_width =
		ucontrol->value.integer.value[i++];
		/* Shift of 1 indicates this is V2 mixer control */
		if (shift == 1)
		lsm_app_type_cfg[j].num_out_channels =
		ucontrol->value.integer.value[i++];
		}

		return 0;
		@@ -14852,6 +14860,9 @@ static const struct snd_kcontrol_new lsm_app_type_cfg_controls[] = {
		SOC_SINGLE_MULTI_EXT("Listen App Type Config", SND_SOC_NOPM, 0,
		0xFFFFFFFF, 0, 128, msm_routing_get_lsm_app_type_cfg_control,
		msm_routing_put_lsm_app_type_cfg_control),
		SOC_SINGLE_MULTI_EXT("Listen App Type Config V2", SND_SOC_NOPM, 1,
		0xFFFFFFFF, 0, 128, msm_routing_get_lsm_app_type_cfg_control,
		msm_routing_put_lsm_app_type_cfg_control),
		};

		static int msm_routing_get_use_ds1_or_ds2_control(

+1 −0

Original line number	Diff line number	Diff line
		@@ -500,6 +500,7 @@ struct msm_pcm_routing_app_type_data {
		int app_type;
		u32 sample_rate;
		int bit_width;
		u32 num_out_channels;
		};

		struct msm_pcm_stream_app_type_cfg {