From mboxrd@z Thu Jan 1 00:00:00 1970 From: mengdong.lin@linux.intel.com Subject: [PATCH v2 05/11] ASoC: topology: ABI - Add name & component info to BE/CC links Date: Fri, 9 Sep 2016 19:46:04 +0800 Message-ID: <02bd88ec8e15d47d47a65f13abfe2fb47739ebad.1473420558.git.mengdong.lin@linux.intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by alsa0.perex.cz (Postfix) with ESMTP id 26E4D26646C for ; Fri, 9 Sep 2016 13:40:00 +0200 (CEST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: Mengdong Lin , tiwai@suse.de, hardik.t.shah@intel.com, guneshwor.o.singh@intel.com, liam.r.girdwood@linux.intel.com, vinod.koul@intel.com, rakesh.a.ughreja@intel.com, mengdong.lin@intel.com List-Id: alsa-devel@alsa-project.org From: Mengdong Lin Add link name, stream name, CPU and codec components info, for topology to create new backend or codec-codec links in the future. Signed-off-by: Mengdong Lin diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 309c9a7..1d4c3b9 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -39,6 +39,9 @@ */ #define SND_SOC_TPLG_STREAM_CONFIG_MAX 8 +/* maximum number of codecs for a BE/CC link */ +#define SND_SOC_TPLG_LINK_CODECS_MAX 4 + /* individual kcontrol info types - can be mixed with other types */ #define SND_SOC_TPLG_CTL_VOLSW 1 #define SND_SOC_TPLG_CTL_VOLSW_SX 2 @@ -451,6 +454,15 @@ struct snd_soc_tplg_pcm { /* + * Component for backend links. + */ +struct snd_soc_tplg_link_cmpnt { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* component name, optional */ + char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; +} __attribute__((packed)); + +/* * Describes the BE or CC link runtime supported configs or params * * File block representation for BE/CC link config :- @@ -462,9 +474,16 @@ struct snd_soc_tplg_pcm { */ struct snd_soc_tplg_link_config { __le32 size; /* in bytes of this structure */ - __le32 id; /* unique ID - used to match */ + __le32 id; /* unique ID - used to match with DAI link */ struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */ __le32 num_streams; /* number of streams */ + + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* link name */ + char stream_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* stream name */ + + struct snd_soc_tplg_link_cmpnt cpu; /* cpu component */ + struct snd_soc_tplg_link_cmpnt codecs[SND_SOC_TPLG_LINK_CODECS_MAX]; /* codec components */ + __le32 num_codecs; /* number of codecs */ } __attribute__((packed)); /* -- 2.5.0