ASoC: SOF: Add a new op to set up volume table

Add a new op set_up_volume_table for control IPC ops. Define and set
the op for IPC3.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

sound/soc/sof/ipc3-control.c

@@ -694,6 +694,23 @@ static int sof_ipc3_widget_kcontrol_setup(struct snd_sof_dev *sdev,
 return0;
 }
 
+staticint
+sof_ipc3_set_up_volume_table(structsnd_sof_control*scontrol, inttlv[SOF_TLV_ITEMS], intsize)
+{
+inti;
+
+/* init the volume table */
+scontrol->volume_table=kcalloc(size, sizeof(u32), GFP_KERNEL);
+if (!scontrol->volume_table)
+return-ENOMEM;
+
+/* populate the volume table */
+for (i=0; i<size ; i++)
+scontrol->volume_table[i] =vol_compute_gain(i, tlv);
+
+return0;
+}
+
 conststructipc_tplg_control_opstplg_ipc3_control_ops= {
 	.volume_put=sof_ipc3_volume_put,
 	.volume_get=sof_ipc3_volume_get,
@@ -708,4 +725,5 @@ const struct ipc_tplg_control_ops tplg_ipc3_control_ops = {
 	.bytes_ext_volatile_get=sof_ipc3_bytes_ext_volatile_get,
 	.update=sof_ipc3_control_update,
 	.widget_kcontrol_setup=sof_ipc3_widget_kcontrol_setup,
+	.set_up_volume_table=sof_ipc3_set_up_volume_table,
 };

sound/soc/sof/sof-audio.h

@@ -39,6 +39,8 @@
  */
 #defineVOLUME_FWL	16
 
+#defineSOF_TLV_ITEMS 3
+
 structsnd_sof_widget;
 structsnd_sof_route;
 structsnd_sof_control;
@@ -88,6 +90,9 @@ struct ipc_tplg_control_ops {
 void (*update)(structsnd_sof_dev*sdev, void*ipc_control_message);
 /* Optional callback to setup kcontrols associated with an swidget */
 int (*widget_kcontrol_setup)(structsnd_sof_dev*sdev, structsnd_sof_widget*swidget);
+/* mandatory callback to set up volume table for volume kcontrols */
+int (*set_up_volume_table)(structsnd_sof_control*scontrol, inttlv[SOF_TLV_ITEMS],
+intsize);
 };
 
 /**
@@ -465,4 +470,5 @@ int sof_update_ipc_object(struct snd_soc_component *scomp, void *object, enum so
 size_tobject_size, inttoken_instance_num);
 intsof_pcm_setup_connected_widgets(structsnd_sof_dev*sdev, structsnd_soc_pcm_runtime*rtd,
 structsnd_sof_pcm*spcm, intdir);
+u32vol_compute_gain(u32value, int*tlv);
 #endif

sound/soc/sof/topology.c

@@ -32,7 +32,6 @@
 #defineVOL_HALF_DB_STEP	50
 
 /* TLV data items */
-#defineTLV_ITEMS	3
 #defineTLV_MIN 0
 #defineTLV_STEP	1
 #defineTLV_MUTE	2
@@ -133,7 +132,7 @@ int sof_update_ipc_object(struct snd_soc_component *scomp, void *object, enum so
 return0;
 }
 
-staticinlineintget_tlv_data(constint*p, inttlv[TLV_ITEMS])
+staticinlineintget_tlv_data(constint*p, inttlv[SOF_TLV_ITEMS])
 {
 /* we only support dB scale TLV type at the moment */
 if ((int)p[SNDRV_CTL_TLVO_TYPE] !=SNDRV_CTL_TLVT_DB_SCALE)
@@ -223,7 +222,7 @@ static u32 vol_pow32(u32 a, int exp, u32 fwl)
  * Function to calculate volume gain from TLV data.
  * This function can only handle gain steps that are multiples of 0.5 dB
  */
-staticu32vol_compute_gain(u32value, int*tlv)
+u32vol_compute_gain(u32value, int*tlv)
 {
 intdB_gain;
 u32linear_gain;
@@ -262,20 +261,17 @@ static u32 vol_compute_gain(u32 value, int *tlv)
  * "size" specifies the number of entries in the table
  */
 staticintset_up_volume_table(structsnd_sof_control*scontrol,
-inttlv[TLV_ITEMS], intsize)
+inttlv[SOF_TLV_ITEMS], intsize)
 {
-intj;
-
-/* init the volume table */
-scontrol->volume_table=kcalloc(size, sizeof(u32), GFP_KERNEL);
-if (!scontrol->volume_table)
-return-ENOMEM;
+structsnd_soc_component*scomp=scontrol->scomp;
+structsnd_sof_dev*sdev=snd_soc_component_get_drvdata(scomp);
+conststructipc_tplg_ops*tplg_ops=sdev->ipc->ops->tplg;
 
-/* populate the volume table */
-for (j=0; j<size ; j++)
-scontrol->volume_table[j] =vol_compute_gain(j, tlv);
+if (tplg_ops->control->set_up_volume_table)
+returntplg_ops->control->set_up_volume_table(scontrol, tlv, size);
 
-return0;
+dev_err(scomp->dev, "Mandatory op %s not set\n", __func__);
+return-EINVAL;
 }
 
 structsof_dai_types {
@@ -771,7 +767,7 @@ static int sof_control_load_volume(struct snd_soc_component *scomp,
 structsnd_sof_dev*sdev=snd_soc_component_get_drvdata(scomp);
 structsnd_soc_tplg_mixer_control*mc=
 container_of(hdr, structsnd_soc_tplg_mixer_control, hdr);
-inttlv[TLV_ITEMS];
+inttlv[SOF_TLV_ITEMS];
 intret;
 
 /* validate topology data */