From 40a52406673b40b95e88be2eab4b58f665e1e638 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Wed, 28 Feb 2024 15:22:24 +0200 Subject: [PATCH] Tools: Topology2: Use for LNL own platform configuration lnl.conf The new lnl.conf is copy of mtl.conf but DMIC_DRIVER_VERSION needs to be increased by one for a small registers change. Signed-off-by: Seppo Ingalsuo --- tools/topology/topology2/cavs-es83x6.conf | 1 + tools/topology/topology2/cavs-nocodec-bt.conf | 1 + tools/topology/topology2/cavs-nocodec.conf | 2 +- tools/topology/topology2/cavs-rt5682.conf | 1 + tools/topology/topology2/cavs-sdw.conf | 2 +- .../topology2/development/cavs-nocodec-crossover.conf | 2 +- .../topology/topology2/development/cavs-nocodec-rtcaec.conf | 2 +- tools/topology/topology2/platform/intel/lnl.conf | 6 ++++++ tools/topology/topology2/sof-hda-generic.conf | 1 + 9 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 tools/topology/topology2/platform/intel/lnl.conf diff --git a/tools/topology/topology2/cavs-es83x6.conf b/tools/topology/topology2/cavs-es83x6.conf index 03a40ee95a23..f25e5a8b89f1 100644 --- a/tools/topology/topology2/cavs-es83x6.conf +++ b/tools/topology/topology2/cavs-es83x6.conf @@ -67,6 +67,7 @@ Define { # override defaults with platform-specific config IncludeByKey.PLATFORM { "mtl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } # include HDMI config if needed. diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf index cf629185480c..0e9217b5481e 100644 --- a/tools/topology/topology2/cavs-nocodec-bt.conf +++ b/tools/topology/topology2/cavs-nocodec-bt.conf @@ -62,6 +62,7 @@ IncludeByKey.PLATFORM { "tgl" "platform/intel/tgl.conf" "adl" "platform/intel/tgl.conf" "mtl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } # include DMIC config if needed. diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index 167050668ffa..c017252201ac 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -101,7 +101,7 @@ IncludeByKey.PLATFORM { "tgl" "platform/intel/tgl.conf" "adl" "platform/intel/tgl.conf" "mtl" "platform/intel/mtl.conf" - "lnl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } # include DMIC config if needed. diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index 396737b58c67..127d273a6537 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -124,6 +124,7 @@ Define { # override defaults with platform-specific config IncludeByKey.PLATFORM { "mtl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } # include DMIC config if needed. diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index c1416a95b832..12215b7cdb17 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -84,7 +84,7 @@ Define { # override defaults with platform-specific config IncludeByKey.PLATFORM { "mtl" "platform/intel/mtl.conf" - "lnl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } IncludeByKey.ADD_BT { diff --git a/tools/topology/topology2/development/cavs-nocodec-crossover.conf b/tools/topology/topology2/development/cavs-nocodec-crossover.conf index 68e168ba2fa7..d282c39269b1 100644 --- a/tools/topology/topology2/development/cavs-nocodec-crossover.conf +++ b/tools/topology/topology2/development/cavs-nocodec-crossover.conf @@ -52,7 +52,7 @@ IncludeByKey.PLATFORM { "tgl" "platform/intel/tgl.conf" "adl" "platform/intel/tgl.conf" "mtl" "platform/intel/mtl.conf" - "lnl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } # diff --git a/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf b/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf index 2bcf3640c883..a35d9ba1de7c 100644 --- a/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf +++ b/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf @@ -50,7 +50,7 @@ IncludeByKey.PLATFORM { "tgl" "platform/intel/tgl.conf" "adl" "platform/intel/tgl.conf" "mtl" "platform/intel/mtl.conf" - "lnl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } # diff --git a/tools/topology/topology2/platform/intel/lnl.conf b/tools/topology/topology2/platform/intel/lnl.conf new file mode 100644 index 000000000000..547040686c56 --- /dev/null +++ b/tools/topology/topology2/platform/intel/lnl.conf @@ -0,0 +1,6 @@ +# LNL-specific variable definitions +Define { + DMIC_DRIVER_VERSION 4 + SSP_BLOB_VERSION 0x105 + NUM_HDMIS 3 +} diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index aa547af25a50..16b39440bf58 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -57,6 +57,7 @@ Define { # override defaults with platform-specific config IncludeByKey.PLATFORM { "mtl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" } # include HDA config if needed.