sof-cs42l42: Switch to common ucm

jsl/sof-cs42l42/HiFi.conf

@@ -1,64 +0,0 @@
-SectionDevice."Speaker" {
-	Comment "Speaker"
-
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},0"
-	}
-	EnableSequence [
-		cset "name='Spk Switch' on"
-	]
-	DisableSequence [
-		cset "name='Spk Switch' off"
-	]
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones"
-
-	Value {
-		PlaybackPriority 200
-		PlaybackPCM "hw:${CardId},1"
-		PlaybackMixerElem "Mixer"
-		JackControl "Headphone Jack"
-	}
-	EnableSequence [
-		cset "name='Headphone Jack Switch' on"
-		cset "name='DAC HPF Switch' on"
-	]
-	DisableSequence [
-		cset "name='Headphone Jack Switch' off"
-		cset "name='DAC HPF Switch' off"
-	]
-}
-
-SectionDevice."Mic" {
-	Comment "Internal Microphone"
-
-	Value {
-		CapturePriority 100
-		CapturePCM "hw:${CardId},5"
-		CaptureChannels 4
-	}
-}
-
-SectionDevice."Headset" {
-	Comment "Headset Microphone"
-
-	Value {
-		CapturePriority 200
-		CapturePCM "hw:${CardId},1"
-		CaptureMixerElem "Headset Mic"
-		JackControl "Headset Mic Jack"
-	}
-	EnableSequence [
-		cset "name='Headset Mic Switch' on"
-		cset "name='ADC HPF Switch' on"
-	]
-	DisableSequence [
-		cset "name='Headset Mic Switch' off"
-		cset "name='ADC HPF Switch' off"
-	]
-}
-
-Include.hdmi.File "/codecs/hda/hdmi234.conf"

jsl/sof-cs42l42/sof-cs42l42.conf

@@ -1,10 +0,0 @@
-Syntax 6
-
-Comment "sof-cs42l42 internal card"
-
-SectionUseCase."HiFi" {
-	File "HiFi.conf"
-	Comment "Default"
-}
-
-Include.codec-init.File "/codecs/da7219/init.conf"

sof-cs42l42/HiFi.conf

@@ -4,7 +4,7 @@ Include.pcm_split.File "/common/pcm/split.conf"
 Macro [
 	{
 		SplitPCM {
-			Name "glk_stereo_in"
+			Name "dmic_stereo_in"
 			Direction Capture
 			Format S16_LE
 			Channels 2
@@ -56,13 +56,13 @@ SectionDevice."Mic" {
 
 	Value {
 		CapturePriority 100
-		CapturePCM "hw:${CardId},99"
+		CapturePCM "hw:${CardId},${var:dmicpcm}"
 		CaptureChannels 4
 	}
 	Macro.pcm_split.SplitPCMDevice {
-		Name "glk_stereo_in"
+		Name "dmic_stereo_in"
 		Direction Capture
-		Device 99
+		Device "${var:dmicpcm}"
 		HWChannels 4
 		Channels 2
 		Channel0 0
@@ -91,4 +91,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/codecs/hda/hdmi567.conf"
+Include.hdmi.File "/codecs/hda/${var:hdmi}.conf"

sof-cs42l42/sof-cs42l42.conf

@@ -1,10 +1,9 @@
 Syntax 6
 
-Comment "sof-cs42l42 internal card"
-
 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 	Comment "Default"
 }
 
+Include.platform.File "/platforms/intel-sof/platform.conf"
 Include.codec-init.File "/codecs/cs42l42/init.conf"