topology2: cavs: Add SDW speaker,headset,hdmi and DMIC support #6562
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,287 @@ | ||
| <searchdir:cavs> | ||
| <searchdir:include> | ||
| <searchdir:include/common> | ||
| <searchdir:include/components> | ||
| <searchdir:include/dais> | ||
| <searchdir:include/pipelines/cavs> | ||
| <searchdir:cavs/platform/intel> | ||
|
|
||
| <vendor-token.conf> | ||
| <pdm_config.conf> | ||
| <tokens.conf> | ||
| <virtual.conf> | ||
| <host-copier-gain-mixin-playback.conf> | ||
| <mixout-gain-dai-copier-playback.conf> | ||
| <deepbuffer-playback.conf> | ||
| <passthrough-playback.conf> | ||
| <passthrough-capture.conf> | ||
| <passthrough-be.conf> | ||
| <data.conf> | ||
| <pcm.conf> | ||
| <pcm_caps.conf> | ||
| <fe_dai.conf> | ||
| <alh.conf> | ||
| <hda.conf> | ||
| <dmic.conf> | ||
| <hw_config.conf> | ||
| <manifest.conf> | ||
| <route.conf> | ||
| <cavs/common_definitions.conf> | ||
| <copier.conf> | ||
| <pipeline.conf> | ||
| <dai.conf> | ||
| <host.conf> | ||
| <dmic-default.conf> | ||
| <hdmi-default.conf> | ||
|
|
||
| Define { | ||
| DMIC_IO_CLK 38400000 | ||
| NUM_DMICS 0 | ||
| DMIC_DRIVER_VERSION 3 | ||
| # override DMIC default definitions | ||
| PDM1_MIC_A_ENABLE 1 | ||
| PDM1_MIC_B_ENABLE 1 | ||
| DMIC0_HOST_PIPELINE_ID 13 | ||
| DMIC0_DAI_PIPELINE_ID 14 | ||
| DMIC0_HOST_PIPELINE_SINK 'copier.host.13.1' | ||
| DMIC0_DAI_PIPELINE_SRC 'copier.DMIC.14.1' | ||
| DMIC0_NAME 'dmic01' | ||
| DMIC0_ID 4 | ||
| DMIC1_ID 5 | ||
| DMIC0_PCM_CAPS 'Passthrough Capture 13' | ||
| DMIC0_PIPELINE_STREAM_NAME 'copier.DMIC.14.1' | ||
| USE_CHAIN_DMA "false" | ||
| } | ||
|
|
||
| # include DMIC config if needed. | ||
| IncludeByKey.NUM_DMICS { | ||
| "[1-4]" "platform/intel/dmic-generic.conf" | ||
| } | ||
|
|
||
| Define { | ||
| NUM_HDMIS 0 | ||
| } | ||
|
|
||
| # include HDMI config if needed. | ||
| IncludeByKey.NUM_HDMIS { | ||
| "[3-4]" "platform/intel/hdmi-generic.conf" | ||
| } | ||
|
|
||
| # | ||
| # List of all DAIs | ||
| #SDW2-Headset codec, SDW0-Spk amp | ||
| # | ||
| Object.Dai { | ||
| ALH."514" { | ||
|
Collaborator
There was a problem hiding this comment. where is this 514/515 coming from?
Member
There was a problem hiding this comment. it's a mess. We need to compute the ALH identifiers from the position of the links and PDIs, not hard-code like this. It seems like with topology2 everyone forgot about the need to configure multiple hardware layouts as we did for topology1.
Member
There was a problem hiding this comment. and it's again completely wrong to create a new topology per card, we've got to reuse reuse and reuse.
Contributor
Author
There was a problem hiding this comment. Hi @ranj063 and @plbossart , |
||
| id 0 | ||
| direction "playback" | ||
| name SDW2-Playback | ||
| default_hw_conf_id 0 | ||
| rate 48000 | ||
| channels 2 | ||
|
|
||
| Object.Base.hw_config."ALH514" { | ||
| id 0 | ||
| } | ||
| } | ||
| ALH."515" { | ||
| id 1 | ||
| direction "capture" | ||
| name SDW2-Capture | ||
| default_hw_conf_id 1 | ||
| rate 48000 | ||
| channels 2 | ||
|
|
||
| Object.Base.hw_config."ALH515" { | ||
| id 1 | ||
| } | ||
| } | ||
| ALH."0" { | ||
| id 2 | ||
| direction "playback" | ||
| name SDW0-Playback | ||
| default_hw_conf_id 0 | ||
| rate 48000 | ||
| channels 2 | ||
|
|
||
| Object.Base.hw_config."ALH2" { | ||
| id 0 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| # | ||
| # Pipeline definitions | ||
| # | ||
|
|
||
| Object.Pipeline { | ||
| host-copier-gain-mixin-playback."1" { | ||
| index 1 | ||
|
|
||
| Object.Widget.copier.1 { | ||
| stream_name "volume playback 0" | ||
| } | ||
| Object.Widget.gain.1 { | ||
| Object.Control.mixer.1 { | ||
| name '1 Playback Volume 0' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| mixout-gain-dai-copier-playback."2" { | ||
| index 2 | ||
|
|
||
| Object.Widget.pipeline.1.stream_name "copier.ALH.2.1" | ||
|
|
||
| Object.Widget.copier.1 { | ||
| stream_name 'SDW2-Playback' | ||
| dai_type "ALH" | ||
| copier_type "ALH" | ||
| node_type $ALH_LINK_OUTPUT_CLASS | ||
| } | ||
| Object.Widget.gain.1 { | ||
| Object.Control.mixer.1 { | ||
| name '2 Main Playback Volume' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| deepbuffer-playback."5" { | ||
| index 5 | ||
|
|
||
| Object.Widget.copier.1 { | ||
| stream_name 'Deepbuffer Playback' | ||
| } | ||
|
|
||
| Object.Widget.gain.1 { | ||
| Object.Control.mixer.1 { | ||
| name '5 2nd Playback Volume' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| passthrough-capture."4" { | ||
| index 4 | ||
| Object.Widget.pipeline.1.stream_name "copier.ALH.3.1" | ||
|
|
||
| Object.Widget.copier.1.stream_name "Passthrough Capture 0" | ||
| Object.Widget.copier.1.Object.Base.audio_format.1 { | ||
| # 32 -> 16 bits conversion is done here, | ||
| # so in_bit_depth is 32 (and out_bit_depth is 16). | ||
| in_bit_depth 32 | ||
| } | ||
| } | ||
|
|
||
| passthrough-be.3 { | ||
| direction "capture" | ||
| index 3 | ||
| copier_type "ALH" | ||
| Object.Widget.pipeline.1 { | ||
| stream_name 'copier.ALH.3.1' | ||
| } | ||
| Object.Widget.copier.1 { | ||
| stream_name 'SDW2-Capture' | ||
| dai_type "ALH" | ||
| copier_type "ALH" | ||
| type "dai_out" | ||
| node_type $ALH_LINK_INPUT_CLASS | ||
| } | ||
| } | ||
|
|
||
| passthrough-playback."6" { | ||
| # pipeline_id | ||
| index 6 | ||
|
|
||
| Object.Widget.pipeline.1.stream_name "copier.ALH.7.1" | ||
| Object.Widget.copier.1.stream_name "Passthrough Playback 0" | ||
| } | ||
|
|
||
| passthrough-be.7 { | ||
| direction "playback" | ||
| index 7 | ||
|
|
||
| Object.Widget.pipeline.1 { | ||
| stream_name 'copier.ALH.7.1' | ||
| } | ||
| Object.Widget.copier.1 { | ||
| stream_name 'SDW0-Playback' | ||
| dai_type "ALH" | ||
| copier_type "ALH" | ||
| type "dai_in" | ||
| node_type $ALH_LINK_OUTPUT_CLASS | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Object.PCM { | ||
| pcm."0" { | ||
| name "Jack out" | ||
| id 0 | ||
| direction "playback" | ||
| Object.Base.fe_dai."Jack out" {} | ||
|
|
||
| Object.PCM.pcm_caps."playback" { | ||
| name "volume playback 0" | ||
| formats 'S16_LE,S32_LE' | ||
| } | ||
| } | ||
| pcm."1" { | ||
| name "Jack in" | ||
| id 1 | ||
| direction "capture" | ||
| Object.Base.fe_dai."Jack in" {} | ||
|
|
||
| Object.PCM.pcm_caps."capture" { | ||
| name "Passthrough Capture 0" | ||
| formats 'S16_LE,S32_LE' | ||
| } | ||
| } | ||
| pcm."2" { | ||
| name 'DeepBuffer' | ||
| id 2 | ||
| Object.Base.fe_dai.'DeepBuffer' {} | ||
| Object.PCM.pcm_caps.playback { | ||
| name 'Deepbuffer Playback' | ||
| formats 'S32_LE,S24_LE,S16_LE' | ||
| } | ||
| direction playback | ||
| } | ||
| pcm."3" { | ||
| name "Speaker" | ||
| id 3 | ||
| direction "playback" | ||
| Object.Base.fe_dai."Speaker" {} | ||
|
|
||
| Object.PCM.pcm_caps."playback" { | ||
| name "Passthrough Playback 0" | ||
| formats 'S16_LE,S32_LE' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Object.Base { | ||
| route."0" { | ||
| source "gain.2.1" | ||
| sink "copier.ALH.2.1" | ||
| } | ||
|
|
||
| route."1" { | ||
| source "copier.ALH.3.1" | ||
| sink "copier.host.4.1" | ||
| } | ||
|
|
||
| route."2" { | ||
| source "mixin.1.1" | ||
| sink "mixout.2.1" | ||
| } | ||
|
|
||
| route.3 { | ||
| source 'mixin.5.1' | ||
| sink 'mixout.2.1' | ||
| } | ||
|
|
||
| route."4" { | ||
| source "copier.host.6.1" | ||
| sink "copier.ALH.7.1" | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why do you need this?