OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology: remove HDA_DAI_CONFIG and re-use DAI_CONFIG 

remove the HDA_DAI_CONFIG macro and reuse the DAI_CONFIG
macro with type HDA. This will ensure the hw_config
section gets added for HDA dai's as well.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2019-01-15 11:07:00 -08:00 committed by Liam Girdwood
parent 9d10e1a920
commit a00a38a1ec
11 changed files with 26 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/topology/m4/Makefile.am
View File

@ -1,7 +1,6 @@
EXTRA_DIST = \
buffer.m4 \
dai.m4 \
hda.m4 \
mixer.m4 \
mixercontrol.m4 \
pcm.m4 \

2
tools/topology/m4/dai.m4
View File

@ -158,7 +158,7 @@ define(`DAI_CONFIG',
` "'$1$2`"'
` ]'
` data ['
` "'N_DAI_CONFIG($1$2)`_data"'
` ifelse($1, `HDA', `', "'N_DAI_CONFIG($1$2)`_data")'
` "'N_DAI_CONFIG($1$2)`_data_common"'
`ifelse($1, `DMIC',` "'N_DAI_CONFIG($1$2)`_pdm_data"', `')'
` ]'

22
tools/topology/m4/hda.m4
View File

@ -1,22 +0,0 @@
dnl HDA_DAI_CONFIG(idx, link_id, name)
define(`HDA_DAI_CONFIG',
`SectionVendorTuples."'N_DAI_CONFIG(HDA$1)`_tuples_common" {'
` tokens "sof_dai_tokens"'
` tuples."string" {'
` SOF_TKN_DAI_TYPE "HDA"'
` }'
` tuples."word" {'
` SOF_TKN_DAI_INDEX' STR($1)
` }'
`}'
`SectionData."'N_DAI_CONFIG(HDA$1)`_data_common" {'
` tuples "'N_DAI_CONFIG(HDA$1)`_tuples_common"'
`}'
`'
`SectionBE."'$3`" {'
` id "'$2`"'
` index "0"'
` data ['
` "'N_DAI_CONFIG(HDA$1)`_data_common"'
` ]'
`}')

7
tools/topology/sof-apl-da7219.m4
View File

@ -7,7 +7,6 @@ include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`ssp.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')
@ -165,9 +164,9 @@ DAI_CONFIG(DMIC, 0, 2, dmic01,
PDM_CONFIG(DMIC, 0, STEREO_PDM0)))
# 3 HDMI/DP outputs (ID: 3,4,5)
HDA_DAI_CONFIG(3, 3, iDisp1)
HDA_DAI_CONFIG(4, 4, iDisp2)
HDA_DAI_CONFIG(5, 5, iDisp3)
DAI_CONFIG(HDA, 3, 3, iDisp1)
DAI_CONFIG(HDA, 4, 4, iDisp2)
DAI_CONFIG(HDA, 5, 5, iDisp3)
## remove warnings with SST hard-coded routes

8
tools/topology/sof-apl-pcm512x.m4
View File

@ -7,7 +7,6 @@ include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`ssp.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')
@ -114,9 +113,8 @@ DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
SSP_CONFIG_DATA(SSP, 5, 24)))
# 3 HDMI/DP outputs (ID: 1,2,3)
dnl HDA_DAI_CONFIG(dai_index, link_id, name)
HDA_DAI_CONFIG(0, 1, iDisp1)
HDA_DAI_CONFIG(1, 2, iDisp2)
HDA_DAI_CONFIG(2, 3, iDisp3)
DAI_CONFIG(HDA, 0, 1, iDisp1)
DAI_CONFIG(HDA, 1, 2, iDisp2)
DAI_CONFIG(HDA, 2, 3, iDisp3)
DEBUG_END

7
tools/topology/sof-apl-rt298.m4
View File

@ -7,7 +7,6 @@ include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`ssp.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')
@ -100,7 +99,7 @@ DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 5, 24)))
HDA_DAI_CONFIG(3, 3, iDisp1)
HDA_DAI_CONFIG(4, 4, iDisp2)
HDA_DAI_CONFIG(5, 5, iDisp3)
DAI_CONFIG(HDA, 3, 3, iDisp1)
DAI_CONFIG(HDA, 4, 4, iDisp2)
DAI_CONFIG(HDA, 5, 5, iDisp3)

1
tools/topology/sof-apl-src-pcm512x.m4
View File

@ -8,7 +8,6 @@ include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`ssp.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')

7
tools/topology/sof-glk-da7219.m4
View File

@ -7,7 +7,6 @@ include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`ssp.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')
@ -164,9 +163,9 @@ DAI_CONFIG(DMIC, 0, 2, dmic01,
PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))
# 3 HDMI/DP outputs (ID: 3,4,5)
HDA_DAI_CONFIG(3, 3, iDisp1)
HDA_DAI_CONFIG(4, 4, iDisp2)
HDA_DAI_CONFIG(5, 5, iDisp3)
DAI_CONFIG(HDA, 3, 3, iDisp1)
DAI_CONFIG(HDA, 4, 4, iDisp2)
DAI_CONFIG(HDA, 5, 5, iDisp3)
## remove warnings with SST hard-coded routes

7
tools/topology/sof-glk-rt5682.m4
View File

@ -10,7 +10,6 @@ include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`ssp.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')
@ -166,9 +165,9 @@ DAI_CONFIG(DMIC, 0, 2, dmic01,
PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))
# 3 HDMI/DP outputs (ID: 3,4,5)
HDA_DAI_CONFIG(3, 3, iDisp1)
HDA_DAI_CONFIG(4, 4, iDisp2)
HDA_DAI_CONFIG(5, 5, iDisp3)
DAI_CONFIG(HDA, 3, 3, iDisp1)
DAI_CONFIG(HDA, 4, 4, iDisp2)
DAI_CONFIG(HDA, 5, 5, iDisp3)
## remove warnings with SST hard-coded routes

11
tools/topology/sof-hda-generic.m4
View File

@ -6,7 +6,6 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')
@ -133,12 +132,12 @@ PCM_PLAYBACK_ADD(HDMI3, 5, PIPELINE_PCM_9)
#
# HDA outputs
HDA_DAI_CONFIG(0, 4, Analog Playback and Capture)
HDA_DAI_CONFIG(1, 5, Digital Playback and Capture)
DAI_CONFIG(HDA, 0, 4, Analog Playback and Capture)
DAI_CONFIG(HDA, 1, 5, Digital Playback and Capture)
# 3 HDMI/DP outputs (ID: 3,4,5)
HDA_DAI_CONFIG(4, 1, iDisp1)
HDA_DAI_CONFIG(5, 2, iDisp2)
HDA_DAI_CONFIG(6, 3, iDisp3)
DAI_CONFIG(HDA, 4, 1, iDisp1)
DAI_CONFIG(HDA, 5, 2, iDisp2)
DAI_CONFIG(HDA, 6, 3, iDisp3)
VIRTUAL_DAPM_ROUTE_IN(codec0_in, HDA, 1, IN, 1)

11
tools/topology/sof-whl-hda.m4
View File

@ -6,7 +6,6 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`hda.m4')
# Include TLV library
include(`common/tlv.m4')
@ -133,12 +132,12 @@ PCM_PLAYBACK_ADD(HDMI3, 5, PIPELINE_PCM_9)
#
# HDA outputs
HDA_DAI_CONFIG(0, 4, Analog Playback and Capture)
HDA_DAI_CONFIG(1, 5, Digital Playback and Capture)
DAI_CONFIG(HDA, 0, 4, Analog Playback and Capture)
DAI_CONFIG(HDA, 1, 5, Digital Playback and Capture)
# 3 HDMI/DP outputs (ID: 3,4,5)
HDA_DAI_CONFIG(4, 1, iDisp1)
HDA_DAI_CONFIG(5, 2, iDisp2)
HDA_DAI_CONFIG(6, 3, iDisp3)
DAI_CONFIG(HDA, 4, 1, iDisp1)
DAI_CONFIG(HDA, 5, 2, iDisp2)
DAI_CONFIG(HDA, 6, 3, iDisp3)
VIRTUAL_DAPM_ROUTE_IN(codec0_in, HDA, 1, IN, 1)