From 2b8988885c9ab59f659d69542b92cb4f27fa6bcb Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 4 Feb 2025 14:17:29 +0200 Subject: [PATCH 1/3] topology2: intel: fix default BT clock for ACE1.5 and newer The Bluetooth configurations use the 24.576Mhz Cardinal Clock as clock source for ACE1.5, configured via the new "clock_source" parameter. Set BT_MCLK correctly for these platforms. Signed-off-by: Kai Vehmanen --- tools/topology/topology2/platform/intel/lnl.conf | 3 +++ tools/topology/topology2/platform/intel/mtl.conf | 3 +++ tools/topology/topology2/platform/intel/ptl.conf | 3 +++ 3 files changed, 9 insertions(+) diff --git a/tools/topology/topology2/platform/intel/lnl.conf b/tools/topology/topology2/platform/intel/lnl.conf index 547040686c56..2fbb8ed12fa9 100644 --- a/tools/topology/topology2/platform/intel/lnl.conf +++ b/tools/topology/topology2/platform/intel/lnl.conf @@ -3,4 +3,7 @@ Define { DMIC_DRIVER_VERSION 4 SSP_BLOB_VERSION 0x105 NUM_HDMIS 3 + + # matches with clock_source=1 (Audio Cardinal Clock) + BT_MCLK 24576000 } diff --git a/tools/topology/topology2/platform/intel/mtl.conf b/tools/topology/topology2/platform/intel/mtl.conf index b685af3c08b1..8bd04bdf734a 100644 --- a/tools/topology/topology2/platform/intel/mtl.conf +++ b/tools/topology/topology2/platform/intel/mtl.conf @@ -3,4 +3,7 @@ Define { DMIC_DRIVER_VERSION 3 SSP_BLOB_VERSION 0x105 NUM_HDMIS 3 + + # matches with clock_source=1 (Audio Cardinal Clock) + BT_MCLK 24576000 } diff --git a/tools/topology/topology2/platform/intel/ptl.conf b/tools/topology/topology2/platform/intel/ptl.conf index 69d5d4f976f0..6ce5ede82d3b 100644 --- a/tools/topology/topology2/platform/intel/ptl.conf +++ b/tools/topology/topology2/platform/intel/ptl.conf @@ -3,4 +3,7 @@ Define { DMIC_DRIVER_VERSION 5 SSP_BLOB_VERSION 0x300 NUM_HDMIS 3 + + # matches with clock_source=1 (Audio Cardinal Clock) + BT_MCLK 24576000 } From f7aeebb1851522076bb720f0ff634e0d41f3c0d2 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 4 Feb 2025 14:19:50 +0200 Subject: [PATCH 2/3] topology2: intel: bt-ssp-config: add comments for clock_source Add a comment that "clock_source" link configuration must be compatible with BT_MCLK. The current generic definition hard codes BT clock source to 1. This definition is ignored on older platforms, and on newer platforms it maps to same 24.576Mhz Cardinal Clock. This sets different constraints on BT_MCLK depending on the target platform. Signed-off-by: Kai Vehmanen --- tools/topology/topology2/platform/intel/bt-ssp-config.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/topology/topology2/platform/intel/bt-ssp-config.conf b/tools/topology/topology2/platform/intel/bt-ssp-config.conf index 1a5353890f5e..2c527b55dcb4 100644 --- a/tools/topology/topology2/platform/intel/bt-ssp-config.conf +++ b/tools/topology/topology2/platform/intel/bt-ssp-config.conf @@ -21,6 +21,8 @@ Object.Dai.SSP [ tdm_slots 1 tx_slots 1 rx_slots 1 + # link_config ignored for Date: Tue, 4 Feb 2025 14:16:41 +0200 Subject: [PATCH 3/3] topology2: intel: bt-generic.conf: fix indentation Fix stray bad indentation. Signed-off-by: Kai Vehmanen --- tools/topology/topology2/platform/intel/bt-generic.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf index 2b0fd8b80753..e1549fb69a2e 100644 --- a/tools/topology/topology2/platform/intel/bt-generic.conf +++ b/tools/topology/topology2/platform/intel/bt-generic.conf @@ -66,7 +66,7 @@ Object.Pipeline { { index $BT_PB_HOST_PIPELINE_ID Object.Widget.pipeline.1 { - stream_name "dai-copier.SSP.$BT_NAME.playback" + stream_name "dai-copier.SSP.$BT_NAME.playback" } Object.Widget.host-copier.1 { stream_name $BT_PB_PCM_CAPS