diff --git a/include/topology.h b/include/topology.h index c5d00805..593eaa61 100644 --- a/include/topology.h +++ b/include/topology.h @@ -40,9 +40,10 @@ extern "C" { * currently recognises the following object types :- * * * Controls (mixer, enumerated and byte) including TLV data. - * * PCMs (FE and BE configurations and capabilities) + * * PCMs (Front End DAI & DAI link) * * DAPM widgets * * DAPM graph elements. + * * Physical DAI & DAI links * * Private data for each object type. * * Manifest (containing count of each object type) * @@ -511,8 +512,8 @@ extern "C" { * refer to section Control Private Data. * *
* SectionPCMCapabilities."name" {
@@ -525,8 +526,8 @@ extern "C" {
* }
*
* The supported formats use the same naming convention as the driver macros.
- * The PCM capabilities name can be referred to and included by BE, PCM and
- * Codec <-> codec topology sections.
+ * The PCM capabilities name can be referred to and included by PCM and
+ * physical DAI sections.
*
*
- * SectionPCM."name" {
- * ....
- * }
- * SectionBE."name" {
- * ....
- * }
- * SectionCC."name" {
- * ....
- * }
- *
- *
- * The section types above should be used for PCMs, Back Ends and Codec to Codec
- * links respectively.
* SectionPCM."name" {
@@ -1031,7 +1015,7 @@ struct snd_tplg_dai_template {
};
/** \struct snd_tplg_link_template
- * \brief Template type for BE and CC DAI Links.
+ * \brief Template type for physical DAI Links.
*/
struct snd_tplg_link_template {
const char *name; /*!< link name, used to match */
@@ -1065,7 +1049,7 @@ typedef struct snd_tplg_obj_template {
struct snd_tplg_enum_template *enum_ctl; /*!< Enum control */
struct snd_tplg_graph_template *graph; /*!< Graph elements */
struct snd_tplg_pcm_template *pcm; /*!< PCM elements */
- struct snd_tplg_link_template *link; /*!< BE and CC Links */
+ struct snd_tplg_link_template *link; /*!< physical DAI Links */
struct snd_tplg_dai_template *dai; /*!< Physical DAI */
};
} snd_tplg_obj_template_t;
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index d7c04c26..2e0a1209 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -1198,7 +1198,6 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
&& t->type != SND_TPLG_TYPE_CC)
return -EINVAL;
- /* here type can be either BE or CC. */
elem = tplg_elem_new_common(tplg, NULL, link_tpl->name, t->type);
if (!elem)
return -ENOMEM;