Unverified Commit 0af0f463 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Introduce struct snd_sof_dai_link 



Introduce a new struct for DAI links to save the DAI link information
parsed from topology. Also add a list of dai_links to struct snd_sof_dev
that will be populated during topology parsing.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220314200520.1233427-2-ranjani.sridharan@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a8ae15ea

sound/soc/sof/core.c

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) 
	INIT_LIST_HEAD(&sdev->kcontrol_list);

	INIT_LIST_HEAD(&sdev->widget_list);

	INIT_LIST_HEAD(&sdev->dai_list);

	INIT_LIST_HEAD(&sdev->dai_link_list);

	INIT_LIST_HEAD(&sdev->route_list);

	INIT_LIST_HEAD(&sdev->ipc_client_list);

	INIT_LIST_HEAD(&sdev->ipc_rx_handler_list);

sound/soc/sof/sof-audio.h

+20 −1
Original line number Diff line number Diff line
@@ -96,7 +96,26 @@ struct snd_sof_control { 
	bool comp_data_dirty;

};



struct snd_sof_widget;

/** struct snd_sof_dai_link - DAI link info

 * @tuples: array of parsed tuples

 * @num_tuples: number of tuples in the tuples array

 * @link: Pointer to snd_soc_dai_link

 * @hw_configs: Pointer to hw configs in topology

 * @num_hw_configs: Number of hw configs in topology

 * @default_hw_cfg_id: Default hw config ID

 * @type: DAI type

 * @list: item in snd_sof_dev dai_link list

 */

struct snd_sof_dai_link {

	struct snd_sof_tuple *tuples;

	int num_tuples;

	struct snd_soc_dai_link *link;

	struct snd_soc_tplg_hw_config *hw_configs;

	int num_hw_configs;

	int default_hw_cfg_id;

	int type;

	struct list_head list;

};



/* ASoC SOF DAPM widget */

struct snd_sof_widget {

sound/soc/sof/sof-priv.h

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ struct snd_sof_dev { 
	struct list_head kcontrol_list;

	struct list_head widget_list;

	struct list_head dai_list;

	struct list_head dai_link_list;

	struct list_head route_list;

	struct snd_soc_component *component;

	u32 enabled_cores_mask; /* keep track of enabled cores */