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: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-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: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 9217644e2eabc8b3cac582767636f055a6502bdb..e91631618bff38a3239d38db042618b66d8a3fef 100644 (file)
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -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);

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index 450ee9977c5564fecac0d1f145d994d7b7964fb2..548d443e83b0fabbed629cb2875d6258ca41e106 100644 (file)
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -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 {

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index ef5a2adae5c72ff96c7b6fda26460c5bd2ba9d02..28d3f1ac8be8298ec49ac130d36d04bf5da00869 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -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 */