Merge branch 'sof-nau8825'

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" {
+If.max98360a {
-	Comment "Speaker"
+	Condition {
-
+		Type String
-	Value {
+		Empty "$${var:max98360a}"
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},0"
 	}
-	EnableSequence [
+	False.Include.speaker.File "/codecs/max98357a/speaker.conf"
-		cset "name='Spk Switch' on"
+}
-	]
+
-	DisableSequence [
+
-		cset "name='Spk Switch' off"
+If.max98373 {
-	]
+	Condition {
+		Type String
+		Empty "$${var:max98373}"
+	}
+	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/HiFi.kano.conf

@@ -1,117 +0,0 @@
-SectionVerb {
-	EnableSequence [
-		cset "name='Frontend PGA Volume' 12"
-		cset "name='Mic Volume' 255"
-		cset "name='Left DAI Sel Mux' Right"
-		cset "name='Right DAI Sel Mux' Left"
-		cset "name='Left Digital Volume' 127"
-		cset "name='Right Digital Volume' 127"
-		cset "name='Left FS Max Volume' 6"
-		cset "name='Right FS Max Volume' 6"
-	]
-}
-
-# Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/common/pcm/split.conf"
-
-Macro [
-	{
-		SplitPCM {
-			Name "adl_stereo_in"
-			Direction Capture
-			Format S32_LE
-			Channels 2
-			HWChannels 4
-			HWChannelPos0 FL
-			HWChannelPos1 FR
-			HWChannelPos2 FL
-			HWChannelPos3 FR
-		}
-	}
-]
-
-SectionDevice."Speaker" {
-	Comment "Internal Speakers"
-
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},0"
-		EchoReferenceDev "Echo Reference"
-	}
-	EnableSequence [
-		cset "name='Spk Switch' on"
-		cset "name='Left Spk Switch' on"
-		cset "name='Right Spk Switch' on"
-		cset "name='Left VI Sense Switch' on"
-		cset "name='Right VI Sense Switch' on"
-	]
-	DisableSequence [
-		cset "name='Spk Switch' off"
-		cset "name='Left Spk Switch' off"
-		cset "name='Right Spk Switch' off"
-		cset "name='Left VI Sense Switch' off"
-		cset "name='Right VI Sense Switch' off"
-	]
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones"
-
-	Value {
-		PlaybackPriority 200
-		PlaybackPCM "hw:${CardId},1"
-		JackControl "Headphone Jack"
-	}
-	EnableSequence [
-		cset "name='Headphone Jack Switch' on"
-	]
-	DisableSequence [
-		cset "name='Headphone Jack Switch' off"
-	]
-}
-
-SectionDevice."Echo Reference" {
-	Value {
-		CapturePCM "hw:${CardId},0"
-	}
-}
-
-SectionDevice."Mic" {
-	Comment "Internal Microphone"
-
-        Value {
-		CapturePriority 100
-                CapturePCM "hw:${CardId},99"
-		CaptureChannels 4
-        }
-	Macro.pcm_split.SplitPCMDevice {
-		Name "adl_stereo_in"
-		Direction Capture
-		Device 99
-		HWChannels 4
-		Channels 2
-		Channel0 0
-		Channel1 1
-		ChannelPos0 FL
-		ChannelPos1 FR
-	}
-}
-
-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"
-	]
-	DisableSequence [
-		cset "name='Headset Mic Switch' off"
-	]
-}
-
-Include.hdmi.File "/codecs/hda/hdmi2345.conf"

adl/sof-nau8825/sof-nau8825.conf

@@ -1,25 +1,18 @@
 Syntax 6
 
-If.osiris {
+SectionUseCase."HiFi" {
-	Condition {
+	File "HiFi.conf"
-		Type String
+	Comment "Default"
-		Haystack "${sys:devices/virtual/dmi/id/product_name}"
-		Needle "Osiris"
-	}
-	True.SectionUseCase."HiFi" {
-		File "HiFi.osiris.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}"
+		Empty "$${var:max98373}"
-		Needle "Kano"
-	}
-	True.SectionUseCase."HiFi" {
-		File "HiFi.kano.conf"
-		Comment "Default"
 	}
+	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