Tools: Topology2: Use for LNL own platform configuration lnl.conf

singalsu · singalsu · commit 566fe5ede1ea · 2024-02-28T17:46:44.000+02:00
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 &lt;seppo.ingalsuo@linux.intel.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ Define {`
`67`	`67`	`# override defaults with platform-specific config`
`68`	`68`	`IncludeByKey.PLATFORM {`
`69`	`69`	`"mtl" "platform/intel/mtl.conf"`
	`70`	`+ "lnl" "platform/intel/lnl.conf"`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`# include HDMI config if needed.`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ IncludeByKey.PLATFORM {`
`62`	`62`	`"tgl" "platform/intel/tgl.conf"`
`63`	`63`	`"adl" "platform/intel/tgl.conf"`
`64`	`64`	`"mtl" "platform/intel/mtl.conf"`
	`65`	`+ "lnl" "platform/intel/lnl.conf"`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`# include DMIC config if needed.`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ IncludeByKey.PLATFORM {`
`101`	`101`	`"tgl" "platform/intel/tgl.conf"`
`102`	`102`	`"adl" "platform/intel/tgl.conf"`
`103`	`103`	`"mtl" "platform/intel/mtl.conf"`
`104`		`- "lnl" "platform/intel/mtl.conf"`
	`104`	`+ "lnl" "platform/intel/lnl.conf"`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`# include DMIC config if needed.`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ Define {`
`124`	`124`	`# override defaults with platform-specific config`
`125`	`125`	`IncludeByKey.PLATFORM {`
`126`	`126`	`"mtl" "platform/intel/mtl.conf"`
	`127`	`+ "lnl" "platform/intel/lnl.conf"`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`# include DMIC config if needed.`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ Define {`
`84`	`84`	`# override defaults with platform-specific config`
`85`	`85`	`IncludeByKey.PLATFORM {`
`86`	`86`	`"mtl" "platform/intel/mtl.conf"`
`87`		`- "lnl" "platform/intel/mtl.conf"`
	`87`	`+ "lnl" "platform/intel/lnl.conf"`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`IncludeByKey.ADD_BT {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ IncludeByKey.PLATFORM {`
`52`	`52`	`"tgl" "platform/intel/tgl.conf"`
`53`	`53`	`"adl" "platform/intel/tgl.conf"`
`54`	`54`	`"mtl" "platform/intel/mtl.conf"`
`55`		`- "lnl" "platform/intel/mtl.conf"`
	`55`	`+ "lnl" "platform/intel/lnl.conf"`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`#`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ IncludeByKey.PLATFORM {`
`50`	`50`	`"tgl" "platform/intel/tgl.conf"`
`51`	`51`	`"adl" "platform/intel/tgl.conf"`
`52`	`52`	`"mtl" "platform/intel/mtl.conf"`
`53`		`- "lnl" "platform/intel/mtl.conf"`
	`53`	`+ "lnl" "platform/intel/lnl.conf"`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`#`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ Define {`
`57`	`57`	`# override defaults with platform-specific config`
`58`	`58`	`IncludeByKey.PLATFORM {`
`59`	`59`	`"mtl" "platform/intel/mtl.conf"`
	`60`	`+ "lnl" "platform/intel/lnl.conf"`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`# include HDA config if needed.`