ucm-config: squawks: Switch to mandatory UCM

- Use mandatory UCM to specify jack for kernel 4.4.
- Remove redundant 'Left Speaker Mixer Left DAC Switch' and
  'Right Speaker Mixer Right DAC Switch' in initial sequence.
- Remove 'HP Left Out Switch' and 'HP Right out Switch'
  because kernel 4.4 does not export such control. This can be
  added back when kernel support is ready.

BUG=chromium:675006
TEST=check headphone / external mic works on squawks.
TEST=check internal speaker / internal mic works on squawks.
     Note sometimes recording fail because of PLL unlocked issue.

Change-Id: Id680d058bff6e1038e109d0ba32cf31e6e9d893b
Reviewed-on: https://chromium-review.googlesource.com/422793
Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Cheng-Yi Chiang <cychiang@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>

1 files changed, 58 insertions, 15 deletions

diff --git a/ucm-config/squawks/byt-max98090/HiFi.conf b/ucm-config/squawks/byt-max98090/HiFi.conf
index 75577c0a..cb114d5e 100644
--- a/ucm-config/squawks/byt-max98090/HiFi.conf
+++ b/ucm-config/squawks/byt-max98090/HiFi.conf
@@ -1,6 +1,6 @@
 SectionVerb {
 	Value {
-		OutputDspName "speaker_eq"
+		FullySpecifiedUCM "1"
 	}
 
 	EnableSequence [
@@ -27,8 +27,6 @@ SectionVerb {
 		cset "name='ADCR Volume' 11"
 		cset "name='ADCL Volume' 11"
 
-		cset "name='Left Speaker Mixer Left DAC Switch' on"
-		cset "name='Right Speaker Mixer Right DAC Switch' on"
 		cset "name='Speaker Left Mixer Volume' 2"
 		cset "name='Speaker Right Mixer Volume' 2"
 		cset "name='Record Path DC Blocking' on"
@@ -37,8 +35,6 @@ SectionVerb {
 		cset "name='Headphone Left Switch' on"
 		cset "name='Headphone Right Switch' on"
 		cset "name='Headphone Switch' off"
-		cset "name='HP Left Out Switch' off"
-		cset "name='HP Right Out Switch' off"
 
 		cset "name='Speaker Left Switch' on"
 		cset "name='Speaker Right Switch' on"
@@ -49,38 +45,84 @@ SectionVerb {
 	]
 }
 
+SectionDevice."Speaker".0 {
+	Value {
+		OutputDspName "speaker_eq"
+		PlaybackPCM "hw:bytmax98090,0"
+		MixerName "Speaker"
+	}
+	EnableSequence [
+		cdev "hw:bytmax98090"
+
+		cset "name='Speaker Left Switch' on"
+		cset "name='Speaker Right Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:bytmax98090"
+
+		cset "name='Speaker Left Switch' off"
+		cset "name='Speaker Right Switch' off"
+	]
+}
+
 SectionDevice."Headphone".0 {
 	Value {
-		JackName "byt-max98090 Headphone Jack"
+		JackType "gpio"
+		JackName "byt-max98090 Headset"
+		JackSwitch "2"
+		PlaybackPCM "hw:bytmax98090,0"
+		MixerName "Headphone"
 		OutputDspName ""
 	}
 
 	EnableSequence [
 		cdev "hw:bytmax98090"
+
 		cset "name='Speaker Left Switch' off"
 		cset "name='Speaker Right Switch' off"
-		cset "name='Headphone Switch' on"
-		cset "name='HP Left Out Switch' on"
-		cset "name='HP Right Out Switch' on"
 	]
 	DisableSequence [
 		cdev "hw:bytmax98090"
-		cset "name='HP Left Out Switch' off"
-		cset "name='HP Right Out Switch' off"
-		cset "name='Headphone Switch' off"
+
 		cset "name='Speaker Left Switch' on"
 		cset "name='Speaker Right Switch' on"
 	]
 }
 
+SectionDevice."Internal Mic".0 {
+	Value {
+		CapturePCM "hw:bytmax98090,0"
+	}
+	EnableSequence [
+		cdev "hw:bytmax98090"
+
+		cset "name='Headset Mic Switch' off"
+		cset "name='Record Path DC Blocking' off"
+		cset "name='Int Mic Switch' on"
+		cset "name='DMIC Mux' DMIC"
+	]
+	DisableSequence [
+		cdev "hw:bytmax98090"
+
+		cset "name='Int Mic Switch' off"
+		cset "name='Headset Mic Switch' on"
+		cset "name='DMIC Mux' ADC"
+		cset "name='Record Path DC Blocking' on"
+	]
+}
+
 SectionDevice."Mic".0 {
 	Value {
-		JackName "byt-max98090 Mic Jack"
-		CaptureControl "MIC2"
+		JackType "gpio"
+		JackName "byt-max98090 Headset"
+		JackSwitch "4"
+		CapturePCM "hw:bytmax98090,0"
+		MixerName "MIC2"
 	}
 
 	EnableSequence [
 		cdev "hw:bytmax98090"
+
 		cset "name='Int Mic Switch' off"
 		cset "name='Headset Mic Switch' on"
 		cset "name='DMIC Mux' ADC"
@@ -89,9 +131,10 @@ SectionDevice."Mic".0 {
 
 	DisableSequence [
 		cdev "hw:bytmax98090"
+
 		cset "name='Headset Mic Switch' off"
+		cset "name='Record Path DC Blocking' off"
 		cset "name='Int Mic Switch' on"
 		cset "name='DMIC Mux' DMIC"
-		cset "name='Record Path DC Blocking' off"
 	]
 }