Merge branch 'sof-nau8825'

adl/sof-nau8825/HiFi.osiris.conf → adl/sof-nau8825/HiFi.conf

@@ -1,10 +1,3 @@
-SectionVerb {
-	EnableSequence [
-		cset "name='Mic Volume' 230"
-		cset "name='Frontend PGA Volume' 24"
-	]
-}
-
 # Split 4ch dmic into 2 virtual 2ch mics
 Include.pcm_split.File "/common/pcm/split.conf"
 
@@ -24,19 +17,21 @@ Macro [
 	}
 ]
 
-SectionDevice."Speaker" {
-	Comment "Speaker"
+If.max98360a {
+	Condition {
+		Type String
+		Empty "$${var:max98360a}"
+	}
+	False.Include.speaker.File "/codecs/max98357a/speaker.conf"
+}
+
 
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},0"
+If.max98373 {
+	Condition {
+		Type String
+		Empty "$${var:max98373}"
 	}
-	EnableSequence [
-		cset "name='Spk Switch' on"
-	]
-	DisableSequence [
-		cset "name='Spk Switch' off"
-	]
+	False.Include.speaker.File "/codecs/max98373/speaker.conf"
 }
 
 SectionDevice."Headphones" {
@@ -60,13 +55,13 @@ SectionDevice."Mic" {
 
         Value {
 		CapturePriority 100
-                CapturePCM "hw:${CardId},99"
+                CapturePCM "hw:${CardId},${var:dmicpcm}"
 		CaptureChannels 4
         }
 	Macro.pcm_split.SplitPCMDevice {
 		Name "adl_stereo_in"
 		Direction Capture
-		Device 99
+		Device "${var:dmicpcm}"
 		HWChannels 4
 		Channels 2
 		Channel0 0
@@ -93,4 +88,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/codecs/hda/hdmi2345.conf"
+Include.hdmi.File "/codecs/hda/${var:hdmi}.conf"

adl/sof-nau8825/sof-nau8825.conf

@@ -1,25 +1,18 @@
 Syntax 6
 
-If.osiris {
-	Condition {
-		Type String
-		Haystack "${sys:devices/virtual/dmi/id/product_name}"
-		Needle "Osiris"
-	}
-	True.SectionUseCase."HiFi" {
-		File "HiFi.osiris.conf"
-		Comment "Default"
-	}
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
 }
 
-If.kano {
+Include.platform.File "/platforms/intel-sof/platform.conf"
+Include.codec.File "/platforms/intel-sof/codecs.conf"
+Include.codec-init.File "/codecs/nau8825/init.conf"
+
+If.max98373 {
 	Condition {
 		Type String
-		Haystack "${sys:devices/virtual/dmi/id/product_name}"
-		Needle "Kano"
-	}
-	True.SectionUseCase."HiFi" {
-		File "HiFi.kano.conf"
-		Comment "Default"
+		Empty "$${var:max98373}"
 	}
+	False.Include.max98373-init.File "/codecs/max98373/init.conf"
 }

codecs/nau8825/init.conf

@@ -0,0 +1,7 @@
+# NAU8825 specific volume control settings
+
+BootSequence [
+	cset "name='Mic Volume' 230"
+	cset "name='Frontend PGA Volume' 24"
+]
+

sof-rt5682/sof-rt5682.conf

@@ -6,7 +6,7 @@ SectionUseCase."HiFi" {
 }
 
 Include.platform.File "/platforms/intel-sof/platform.conf"
-Include.codec.File "codecs.conf"
+Include.codec.File "/platforms/intel-sof/codecs.conf"
 
 # headphone codecs