Skip to content

Change the naming scheme for the SSP/HDA/DMIC DAI copiers #7670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 6 commits into from
May 29, 2023
Merged

Change the naming scheme for the SSP/HDA/DMIC DAI copiers #7670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b70f16
topology2: copier: Rename it to dai-copier
ranj063 May 17, 2023
183db93
topology2: components: Make uuid common for all widgets
ranj063 May 23, 2023
f5394c7
topology2: tokens: Reduce the string length of token names
ranj063 May 23, 2023
713d432
topology2: dai-copier: Change the naming convention
ranj063 May 17, 2023
9feb83d
topology2: dai-copier: num_input_pins/num_output_pins shouldn't be ma…
ranj063 May 19, 2023
9e24aed
topology2: dai-copier: Add clarification on input/output format counts
ranj063 May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Define {
ANALOG_PLAYBACK_PCM 'Analog Playback'
ANALOG_CAPTURE_PCM 'Analog Capture'
HDA_ANALOG_DAI_NAME 'Analog Playback and Capture'
HDA_ANALOG_DAI_NAME 'Analog'
DEEP_BUFFER_PIPELINE_ID 15
DEEP_BUFFER_PCM_ID 31
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'
Expand Down Expand Up @@ -32,7 +32,7 @@ Object.Pipeline {
{
index 2

Object.Widget.copier.1 {
Object.Widget.dai-copier.1 {
node_type $HDA_LINK_OUTPUT_CLASS
stream_name $HDA_ANALOG_DAI_NAME
dai_type "HDA"
Expand Down Expand Up @@ -88,12 +88,13 @@ Object.Pipeline {
index 4
direction capture

Object.Widget.copier."1" {
Object.Widget.dai-copier."1" {
dai_type "HDA"
type "dai_out"
copier_type "HDA"
stream_name $HDA_ANALOG_DAI_NAME
node_type $HDA_LINK_INPUT_CLASS
num_output_pins 1
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
Expand Down Expand Up @@ -128,15 +129,15 @@ Object.PCM.pcm [
# top-level pipeline connections
Object.Base.route [
{
sink 'copier.HDA.2.1'
sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback'
source 'eqfir.2.1'
}
{
source 'mixin.1.1'
sink 'mixout.2.1'
}
{
source 'copier.HDA.4.1'
source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture'
sink 'host-copier.0.capture'
}
{
Expand Down
10 changes: 5 additions & 5 deletions tools/topology/topology2/cavs-mixin-mixout-hda.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Define {
ANALOG_PLAYBACK_PCM 'Analog Playback'
ANALOG_CAPTURE_PCM 'Analog Capture'
HDA_ANALOG_DAI_NAME 'Analog Playback and Capture'
HDA_ANALOG_DAI_NAME 'Analog'
DEEP_BUFFER_PIPELINE_ID 15
DEEP_BUFFER_PCM_ID 31
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'
Expand Down Expand Up @@ -32,7 +32,7 @@ Object.Pipeline {
{
index 2

Object.Widget.copier.1 {
Object.Widget.dai-copier.1 {
node_type $HDA_LINK_OUTPUT_CLASS
stream_name $HDA_ANALOG_DAI_NAME
dai_type "HDA"
Expand Down Expand Up @@ -78,7 +78,7 @@ Object.Pipeline {
index 4
direction capture

Object.Widget.copier."1" {
Object.Widget.dai-copier."1" {
dai_type "HDA"
type "dai_out"
copier_type "HDA"
Expand Down Expand Up @@ -123,15 +123,15 @@ Object.PCM.pcm [
# top-level pipeline connections
Object.Base.route [
{
sink 'copier.HDA.2.1'
sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback'
source 'gain.2.1'
}
{
source 'mixin.1.1'
sink 'mixout.2.1'
}
{
source 'copier.HDA.4.1'
source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture'

@plbossart plbossart May 23, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we need to reduce the widget name length, "playback" and "capture" are obvious targets.

We could use something like "p"/"c" (as done for ALSA in /proc pcm0c/ pcm0p/ pcm10p/ pcm1p/). Or 'pb' and 'cp'.

Just a suggestion.

sink 'eqiir.4.1'
}
{
Expand Down
24 changes: 13 additions & 11 deletions tools/topology/topology2/cavs-nocodec-bt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<manifest.conf>
<route.conf>
<intel/common_definitions.conf>
<copier.conf>
<dai-copier.conf>
<pipeline.conf>
<dai.conf>
<host.conf>
Expand All @@ -41,11 +41,11 @@ Define {
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_DAI_PIPELINE_SRC 'dai-copier.DMIC.NoCodec-6.capture'
DMIC0_NAME 'NoCodec-6'
DMIC1_NAME 'NoCodec-7'
DMIC0_PCM_CAPS 'Passthrough Capture 13'
DMIC0_PIPELINE_STREAM_NAME 'copier.DMIC.14.1'
DMIC0_PIPELINE_STREAM_NAME 'dai-copier.DMIC.14.1'

# override BT configuration
BT_NAME "NoCodec-2"
Expand Down Expand Up @@ -130,12 +130,13 @@ Object.Pipeline {
stream_name 'NoCodec-0'
}

Object.Widget.copier.1 {
Object.Widget.dai-copier.1 {
dai_index 0
dai_type "SSP"
copier_type "SSP"
stream_name "NoCodec-0"
node_type $I2S_LINK_OUTPUT_CLASS
num_input_pins 1
}
}
{
Expand All @@ -145,12 +146,13 @@ Object.Pipeline {
stream_name 'NoCodec-1'
}

Object.Widget.copier.1 {
Object.Widget.dai-copier.1 {
dai_index 1
dai_type "SSP"
copier_type "SSP"
stream_name "NoCodec-1"
node_type $I2S_LINK_OUTPUT_CLASS
num_input_pins 1
}
}
]
Expand Down Expand Up @@ -210,7 +212,7 @@ Object.Pipeline {
stream_name 'NoCodec-0'
}

Object.Widget.copier."1" {
Object.Widget.dai-copier."1" {
dai_index 0
dai_type "SSP"
type dai_out
Expand All @@ -232,7 +234,7 @@ Object.Pipeline {
stream_name 'NoCodec-1'
}

Object.Widget.copier."1" {
Object.Widget.dai-copier."1" {
dai_index 1
dai_type "SSP"
type dai_out
Expand Down Expand Up @@ -296,18 +298,18 @@ Object.PCM.pcm [
Object.Base.route [
{
source "host-copier.0.playback"
sink "copier.SSP.2.1"
sink "dai-copier.SSP.NoCodec-0.playback"
}
{
source "host-copier.1.playback"
sink "copier.SSP.4.1"
sink "dai-copier.SSP.NoCodec-1.playback"
}
{
source "copier.SSP.6.1"
source "dai-copier.SSP.NoCodec-0.capture"
sink "host-copier.0.capture"
}
{
source "copier.SSP.10.1"
source "dai-copier.SSP.NoCodec-1.capture"
sink "host-copier.1.capture"
}
]
26 changes: 13 additions & 13 deletions tools/topology/topology2/cavs-nocodec-multicore.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<manifest.conf>
<route.conf>
<intel/common_definitions.conf>
<copier.conf>
<dai-copier.conf>
<module-copier.conf>
<pipeline.conf>
<dai.conf>
Expand Down Expand Up @@ -158,7 +158,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [
index 14

core $SSP0_CORE_ID
Object.Widget.copier.1 {
Object.Widget.dai-copier.1 {
core_id $SSP0_CORE_ID
dai_index 0
dai_type "SSP"
Expand All @@ -178,7 +178,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [
index 6

core $SSP2_CORE_ID
Object.Widget.copier.1 {
Object.Widget.dai-copier.1 {
core_id $SSP2_CORE_ID
dai_index 2
dai_type "SSP"
Expand Down Expand Up @@ -223,7 +223,7 @@ Object.Pipeline.io-gateway-capture [
index 8
direction capture

Object.Widget.copier."1" {
Object.Widget.dai-copier."1" {
dai_index 1
dai_type "SSP"
type dai_out
Expand All @@ -242,7 +242,7 @@ Object.Pipeline.io-gateway-capture [
index 12
direction capture

Object.Widget.copier."1" {
Object.Widget.dai-copier."1" {
dai_index 2
dai_type "SSP"
type dai_out
Expand Down Expand Up @@ -305,26 +305,26 @@ Object.PCM.pcm [
Object.Base.route [
{
source "gain.14.1"
sink "copier.SSP.14.1"
sink "dai-copier.SSP.NoCodec-0.playback"
}
{
source "mixin.1.1"
sink "mixout.14.1"
}
{
source "gain.6.1"
sink "copier.SSP.6.1"
sink "dai-copier.SSP.NoCodec-2.playback"
}
{
source "mixin.5.1"
sink "mixout.6.1"
}
{
source "copier.SSP.8.1"
source "dai-copier.SSP.NoCodec-0.capture"
sink "host-copier.0.capture"
}
{
source "copier.SSP.12.1"
source "dai-copier.SSP.NoCodec-2.capture"
sink "host-copier.2.capture"
}
{
Expand Down Expand Up @@ -392,7 +392,7 @@ IncludeByKey.SSP1_ENABLED {
index 4

core $SSP1_CORE_ID
Object.Widget.copier.1 {
Object.Widget.dai-copier.1 {
core_id $SSP1_CORE_ID
dai_index 1
dai_type "SSP"
Expand Down Expand Up @@ -429,7 +429,7 @@ IncludeByKey.SSP1_ENABLED {
index 10
direction capture

Object.Widget.copier."1" {
Object.Widget.dai-copier."1" {
dai_index 1
dai_type "SSP"
type dai_out
Expand Down Expand Up @@ -476,10 +476,10 @@ IncludeByKey.SSP1_ENABLED {
}
{
source "gain.4.1"
sink "copier.SSP.4.1"
sink "dai-copier.SSP.NoCodec-1.playback"
}
{
source "copier.SSP.10.1"
source "dai-copier.SSP.NoCodec-1.capture"
sink "host-copier.1.capture"
}
{
Expand Down
Loading