From 3d903b5e3fa07c738ec479ba95e89a5ed60df9bc Mon Sep 17 00:00:00 2001 From: Pan Xiuli Date: Mon, 23 Jul 2018 16:12:23 +0800 Subject: [PATCH] topology: Add dai index in DAI SectionBE DAI_TYPE and DAI_INDEX are both needed to get the dai in FW, add DAI_INDEX in SectionBE to make sure we can handle multiple type dais. Signed-off-by: Pan Xiuli --- topology/m4/dai.m4 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 index b0802af..516354b 100644 --- a/topology/m4/dai.m4 +++ b/topology/m4/dai.m4 @@ -132,14 +132,17 @@ define(`DAI_CONFIG', `' ` ifelse($1, `SSP', $5, `}')' `ifelse($1, `DMIC', $5, `')' -`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_common" {' ` tokens "sof_dai_tokens"' ` tuples."string" {' ` SOF_TKN_DAI_TYPE' STR($1) ` }' +` tuples."word" {' +` SOF_TKN_DAI_INDEX' STR($2) +` }' `}' -`SectionData."'N_DAI_CONFIG($1$2)`_data_str" {' -` tuples "'N_DAI_CONFIG($1$2)`_tuples_str"' +`SectionData."'N_DAI_CONFIG($1$2)`_data_common" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples_common"' `}' `' `SectionBE."'$4`" {' @@ -152,7 +155,7 @@ define(`DAI_CONFIG', ` ]' ` data [' ` "'N_DAI_CONFIG($1$2)`_data"' -` "'N_DAI_CONFIG($1$2)`_data_str"' +` "'N_DAI_CONFIG($1$2)`_data_common"' `ifelse($1, `DMIC',` "'N_DAI_CONFIG($1$2)`_pdm_data"', `')' ` ]' `}')