Skip to content

topology2: ssp: add link clock aux data for mtl #7060

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

Closed
juimonen wants to merge 1 commit into from
Closed

topology2: ssp: add link clock aux data for mtl #7060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 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 @@ -2,6 +2,7 @@
<searchdir:include/common>
<searchdir:include/components>
<searchdir:include/dais>
<searchdir:include/dais/intel>
<searchdir:include/pipelines/cavs>
<searchdir:platform/intel>

Expand Down Expand Up @@ -29,9 +30,11 @@
<dai.conf>
<host.conf>
<dmic-default.conf>
<ssp-default.conf>

<bt-default.conf>
<bt-generic.conf>
<intel_ssp_aux_config.conf>

Define {
MCLK 24576000
Expand Down Expand Up @@ -78,12 +81,21 @@ Object.Dai.SSP [
sample_bits 32
quirks "lbm_mode"
io_clk $MCLK
version $SSP_BLOB_VERSION

Object.Base.hw_config.1 {
name "SSP0"
id 0
mclk_freq $MCLK
bclk_freq 3072000
tdm_slot_width 32
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
{
Expand All @@ -95,13 +107,21 @@ Object.Dai.SSP [
sample_bits 32
quirks "lbm_mode"
io_clk $MCLK
version $SSP_BLOB_VERSION

Object.Base.hw_config.1 {
name "SSP1"
id 0
mclk_freq $MCLK
bclk_freq 3072000
tdm_slot_width 32
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
]
Expand Down
28 changes: 28 additions & 0 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<searchdir:include/common>
<searchdir:include/components>
<searchdir:include/dais>
<searchdir:include/dais/intel>
<searchdir:include/pipelines/cavs>
<searchdir:platform/intel>

Expand Down Expand Up @@ -42,6 +43,9 @@
<input_audio_format.conf>
<output_audio_format.conf>
<dmic-default.conf>
<ssp-default.conf>
<intel_ssp_aux_config.conf>


Define {
MCLK 24576000
Expand Down Expand Up @@ -94,13 +98,21 @@ Object.Dai.SSP [
sample_bits 32
quirks "lbm_mode"
io_clk $MCLK
version $SSP_BLOB_VERSION

Object.Base.hw_config.1 {
name "SSP0"
id 0
mclk_freq $MCLK
bclk_freq 3072000
tdm_slot_width 32
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
{
Expand All @@ -112,13 +124,21 @@ Object.Dai.SSP [
sample_bits 32
quirks "lbm_mode"
io_clk $MCLK
version $SSP_BLOB_VERSION

Object.Base.hw_config.1 {
name "SSP1"
id 0
mclk_freq $MCLK
bclk_freq 3072000
tdm_slot_width 32
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
{
Expand All @@ -130,13 +150,21 @@ Object.Dai.SSP [
sample_bits 32
quirks "lbm_mode"
io_clk $MCLK
version $SSP_BLOB_VERSION

Object.Base.hw_config.1 {
name "SSP2"
id 0
mclk_freq $MCLK
bclk_freq 3072000
tdm_slot_width 32
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
Copy link
Member

@plbossart plbossart Feb 8, 2023

Choose a reason for hiding this comment

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

do we really want to add this everywhere, when this is clearly a SOC-specific configuration that should be default in all topologies?

This should be part of a platform definition, not in all topologies IMHO.

Copy link
Member

@lgirdwood lgirdwood Mar 8, 2023

Choose a reason for hiding this comment

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

@juimonen can we take this from platform.conf i.e. using the same method as SSP_BLOB_VERSION above ? This could be an attribute in teh base class that would default to PLATFORM_CLOCK_blah_DEFAULT ?

Copy link
Author

@juimonen juimonen Mar 30, 2023

Choose a reason for hiding this comment

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

I don't currently know a way to add this to all hw_configs in a certain platform in some other way than this

}
}
]
Expand Down
18 changes: 18 additions & 0 deletions tools/topology/topology2/cavs-rt5682.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<searchdir:include/common>
<searchdir:include/components>
<searchdir:include/dais>
<searchdir:include/dais/intel>
<searchdir:include/pipelines/cavs>
<searchdir:platform/intel>

Expand Down Expand Up @@ -36,9 +37,11 @@
<dai.conf>
<host.conf>
<dmic-default.conf>
<ssp-default.conf>
<hdmi-default.conf>
<bt-default.conf>
<bt-generic.conf>
<intel_ssp_aux_config.conf>

Define {
MCLK 24576000
Expand Down Expand Up @@ -128,13 +131,21 @@ Object.Dai.SSP [
default_hw_conf_id 0
sample_bits 32
io_clk $MCLK
version $SSP_BLOB_VERSION

Object.Base.hw_config.1 {
name $HEADSET_HW_CONFIG_NAME
id 0
mclk_freq $MCLK
bclk_freq 3072000
tdm_slot_width 32
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
{
Expand All @@ -160,6 +171,13 @@ Object.Dai.SSP [
mclk_freq $MCLK
bclk_freq 3072000
tdm_slot_width 32
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
]
Expand Down
22 changes: 22 additions & 0 deletions tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Object.Dai.SSP [
sample_bits 16
quirks "lbm_mode"
io_clk $BT_MCLK
version $SSP_BLOB_VERSION
Object.Base.hw_config.1 {
id 0
name "BT-SCO-WB"
Expand All @@ -22,6 +23,13 @@ Object.Dai.SSP [
tdm_slots 1
tx_slots 1
rx_slots 1
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
Object.Base.hw_config.2 {
id 1
Expand All @@ -37,6 +45,13 @@ Object.Dai.SSP [
tdm_slots 1
tx_slots 1
rx_slots 1
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
Object.Base.hw_config.3 {
id 2
Expand All @@ -51,6 +66,13 @@ Object.Dai.SSP [
tdm_slots 2
tx_slots 3
rx_slots 3
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
]
22 changes: 22 additions & 0 deletions tools/topology/topology2/platform/intel/bt-ssp-config.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Object.Dai.SSP [
default_hw_conf_id 0
sample_bits 16
io_clk $BT_MCLK
version $SSP_BLOB_VERSION
Object.Base.hw_config.1 {
id 0
name "BT-SCO-WB"
Expand All @@ -21,6 +22,13 @@ Object.Dai.SSP [
tdm_slots 1
tx_slots 1
rx_slots 1
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
Object.Base.hw_config.2 {
id 1
Expand All @@ -36,6 +44,13 @@ Object.Dai.SSP [
tdm_slots 1
tx_slots 1
rx_slots 1
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
Object.Base.hw_config.3 {
id 2
Expand All @@ -50,6 +65,13 @@ Object.Dai.SSP [
tdm_slots 2
tx_slots 3
rx_slots 0
IncludeByKey.PLATFORM {
"mtl" {
Object.Base.link_config.1 {
clock_source 1
}
}
}
}
}
]
1 change: 1 addition & 0 deletions tools/topology/topology2/platform/intel/mtl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# MTL-specific variable definitions
Define {
DMIC_DRIVER_VERSION 3
SSP_BLOB_VERSION 0x105
}
4 changes: 4 additions & 0 deletions tools/topology/topology2/platform/intel/ssp-default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Default SSP variable definitions
Define {
SSP_BLOB_VERSION 0x100
}