audio/ucm2: port wm8962 to ucm2

default/audio/ucm2/wm8962/HiFi.conf

 SectionVerb {
 	EnableSequence [
-		cdev "hw:wm8962"
 		cset "name='Digital Playback Volume' 100,100"
 		cset "name='MIXINL IN2L Switch' off"
 		cset "name='MIXINL IN3L Switch' off"
@@ -16,11 +15,13 @@ SectionVerb {
 		cset "name='INPGAL IN4L Switch' off"
 		cset "name='Input Mixer Switch' off,on"
 		cset "name='SPKOUTL PGA' Mixer"
+		cset "name='Speaker Volume', on"
+		cset "name='Headphone Volume', off"
+		cset "name='Digital Capture Volume', off"
 		cset "name='SPKOUTR PGA' Mixer"
 	]
 
 	DisableSequence [
-		cdev "hw:wm8962"
 		cset "name='Digital Playback Volume' 0,0"
 	]
 
@@ -29,7 +30,7 @@ SectionVerb {
 	}
 }
 
-SectionDevice."Handset".0 {
+SectionDevice."Handset" {
 	Comment "Handset"
 
 	ConflictingDevice [
@@ -38,7 +39,6 @@ SectionDevice."Handset".0 {
 	]
 
 	EnableSequence [
-		cdev "hw:wm8962"
 		cset "name='Speaker Switch' off,on"
 		cset "name='DAC L/R Swap Switch' on"
 		cset "name='DAC Monomix Switch' on"
@@ -48,7 +48,6 @@ SectionDevice."Handset".0 {
 	]
 
 	DisableSequence [
-		cdev "hw:wm8962"
 		cset "name='Speaker Switch' off,off"
 		cset "name='DAC L/R Swap Switch' off"
 		cset "name='DAC Monomix Switch' off"
@@ -58,13 +57,12 @@ SectionDevice."Handset".0 {
 	Value {
 		PlaybackChannels "2"
 		PlaybackPriority "100"
-		PlaybackVolume "name='Speaker Volume'"
 		PlaybackSwitch "name='Speaker Switch'"
-		PlaybackPCM "hw:CARD=wm8962"
+		PlaybackPCM "hw:${CardId},0"
 	}
 }
 
-SectionDevice."Speaker".0 {
+SectionDevice."Speaker" {
 	Comment "Speaker"
 
 	ConflictingDevice [
@@ -73,7 +71,6 @@ SectionDevice."Speaker".0 {
 	]
 
 	EnableSequence [
-		cdev "hw:wm8962"
 		cset "name='Speaker Switch' on,off"
 		cset "name='DAC Monomix Switch' on"
 		cset "name='SPKOUTL PGA' DAC"
@@ -82,7 +79,6 @@ SectionDevice."Speaker".0 {
 	]
 
 	DisableSequence [
-		cdev "hw:wm8962"
 		cset "name='Speaker Switch' off,off"
 		cset "name='DAC Monomix Switch' off"
 		cset "name='SPKOUTL PGA' Mixer"
@@ -91,13 +87,32 @@ SectionDevice."Speaker".0 {
 	Value {
 		PlaybackChannels "2"
 		PlaybackPriority "500"
-		PlaybackVolume "name='Speaker Volume'"
 		PlaybackSwitch "name='Speaker Switch'"
-		PlaybackPCM "hw:CARD=wm8962"
+		PlaybackPCM "hw:${CardId},0"
 	}
 }
 
-SectionDevice."Headphones".0 {
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+
+	EnableSequence [
+		cset "name='Digital Capture Volume' 116,116"
+		cset "name='ADC L/R Swap Switch' on"
+	]
+
+	DisableSequence [
+		cset "name='Digital Capture Volume' 0,0"
+		cset "name='ADC L/R Swap Switch' off"
+	]
+
+	Value {
+		CapturePriority "500"
+		CaptureChannels "2"
+		CapturePCM "hw:${CardId},0"
+	}
+}
+
+SectionDevice."Headphones" {
 	Comment "Headphones"
 
 	ConflictingDevice [
@@ -106,7 +121,6 @@ SectionDevice."Headphones".0 {
 	]
 
 	EnableSequence [
-		cdev "hw:wm8962"
 		cset "name='Headphone Switch' on,on"
 		cset "name='HPOUTL PGA' 0 unmute"
 		cset "name='HPOUTR PGA' 0 unmute"
@@ -115,7 +129,6 @@ SectionDevice."Headphones".0 {
 	]
 
 	DisableSequence [
-		cdev "hw:wm8962"
 		cset "name='Headphone Switch' off off"
 		cset "name='HPOUTL PGA' 0 mute"
 		cset "name='HPOUTR PGA' 0 mute"
@@ -124,36 +137,8 @@ SectionDevice."Headphones".0 {
 	Value {
 		PlaybackPriority "1000"
 		PlaybackChannels "2"
-		PlaybackVolume "name='Headphone Volume'"
 		PlaybackSwitch "name='Headphone Switch'"
-		PlaybackPCM "hw:CARD=wm8962"
+		PlaybackPCM "hw:${CardId},0"
 		JackControl "Headphones Jack"
 	}
 }
-
-SectionDevice."Mic".0 {
-	Comment "Internal Microphone"
-
-	ConflictingDevice [
-		"Headset"
-	]
-
-	EnableSequence [
-		cdev "hw:wm8962"
-		cset "name='Digital Capture Volume' 116,116"
-		cset "name='ADC L/R Swap Switch' on"
-	]
-
-	DisableSequence [
-		cdev "hw:wm8962"
-		cset "name='Digital Capture Volume' 0,0"
-		cset "name='ADC L/R Swap Switch' off"
-	]
-
-	Value {
-		CapturePriority "500"
-		CaptureChannels "2"
-		CaptureVolume "name='Digital Capture Volume'"
-		CapturePCM "hw:CARD=wm8962"
-	}
-}

default/audio/ucm2/wm8962/wm8962.conf

+Syntax 2
+
 Comment "WM8962 Codec for Librem 5 Phone"
 
 SectionUseCase."HiFi" {