ucm-config: veyron: use fully specified UCM

BUG=chrome-os-partner:58861
TEST=check speaker/headphone on minnie

Change-Id: I7ec8fb49036c3102dc9bdb99abcb82fdb69753fc
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/423293
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>

4 files changed, 164 insertions, 0 deletions

diff --git a/ucm-config/veyron/ROCKCHIP-I2S/HiFi.conf b/ucm-config/veyron/ROCKCHIP-I2S/HiFi.conf
index bdfd29c1..f01190c3 100644
--- a/ucm-config/veyron/ROCKCHIP-I2S/HiFi.conf
+++ b/ucm-config/veyron/ROCKCHIP-I2S/HiFi.conf
@@ -2,6 +2,7 @@ SectionVerb {
 	Value {
 		OutputDspName "speaker_eq"
 		MinBufferLevel "512"
+		FullySpecifiedUCM "1"
 	}
 
 	EnableSequence [
@@ -47,8 +48,45 @@ SectionVerb {
 	]
 }
 
+SectionDevice."Speaker".0 {
+	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Speaker"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' off"
+	]
+}
+
+SectionDevice."Internal Mic".0 {
+	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Int Mic"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' off"
+	]
+}
+
 SectionDevice."Headphone".0 {
 	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headphone"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 		OutputDspName ""
 	}
@@ -73,6 +111,9 @@ SectionDevice."Headphone".0 {
 
 SectionDevice."Mic".0 {
 	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headset Mic"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 	}
 
diff --git a/ucm-config/veyron_jaq/ROCKCHIP-I2S/HiFi.conf b/ucm-config/veyron_jaq/ROCKCHIP-I2S/HiFi.conf
index ad142239..47012622 100644
--- a/ucm-config/veyron_jaq/ROCKCHIP-I2S/HiFi.conf
+++ b/ucm-config/veyron_jaq/ROCKCHIP-I2S/HiFi.conf
@@ -2,6 +2,7 @@ SectionVerb {
 	Value {
 		OutputDspName "speaker_eq"
 		MinBufferLevel "512"
+		FullySpecifiedUCM "1"
 	}
 
 	EnableSequence [
@@ -52,8 +53,45 @@ SectionVerb {
 	]
 }
 
+SectionDevice."Speaker".0 {
+	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Speaker"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' off"
+	]
+}
+
+SectionDevice."Internal Mic".0 {
+	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Int Mic"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' off"
+	]
+}
+
 SectionDevice."Headphone".0 {
 	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headphone"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 		OutputDspName ""
 	}
@@ -78,6 +116,9 @@ SectionDevice."Headphone".0 {
 
 SectionDevice."Mic".0 {
 	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headset Mic"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 	}
 
diff --git a/ucm-config/veyron_minnie/ROCKCHIP-I2S/HiFi.conf b/ucm-config/veyron_minnie/ROCKCHIP-I2S/HiFi.conf
index 68008b3c..ce29a3f5 100644
--- a/ucm-config/veyron_minnie/ROCKCHIP-I2S/HiFi.conf
+++ b/ucm-config/veyron_minnie/ROCKCHIP-I2S/HiFi.conf
@@ -2,6 +2,7 @@ SectionVerb {
 	Value {
 		OutputDspName "speaker_eq"
 		MinBufferLevel "512"
+		FullySpecifiedUCM "1"
 	}
 
 	EnableSequence [
@@ -47,8 +48,45 @@ SectionVerb {
 	]
 }
 
+SectionDevice."Speaker".0 {
+	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Speaker"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' off"
+	]
+}
+
+SectionDevice."Internal Mic".0 {
+	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Int Mic"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' off"
+	]
+}
+
 SectionDevice."Headphone".0 {
 	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headphone"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 		OutputDspName ""
 	}
@@ -73,6 +111,9 @@ SectionDevice."Headphone".0 {
 
 SectionDevice."Mic".0 {
 	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headset Mic"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 	}
 
diff --git a/ucm-config/veyron_speedy/ROCKCHIP-I2S/HiFi.conf b/ucm-config/veyron_speedy/ROCKCHIP-I2S/HiFi.conf
index 68008b3c..ce29a3f5 100644
--- a/ucm-config/veyron_speedy/ROCKCHIP-I2S/HiFi.conf
+++ b/ucm-config/veyron_speedy/ROCKCHIP-I2S/HiFi.conf
@@ -2,6 +2,7 @@ SectionVerb {
 	Value {
 		OutputDspName "speaker_eq"
 		MinBufferLevel "512"
+		FullySpecifiedUCM "1"
 	}
 
 	EnableSequence [
@@ -47,8 +48,45 @@ SectionVerb {
 	]
 }
 
+SectionDevice."Speaker".0 {
+	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Speaker"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Speaker Switch' off"
+	]
+}
+
+SectionDevice."Internal Mic".0 {
+	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Int Mic"
+	}
+	EnableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:ROCKCHIPI2S"
+
+		cset "name='Int Mic Switch' off"
+	]
+}
+
 SectionDevice."Headphone".0 {
 	Value {
+		PlaybackPCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headphone"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 		OutputDspName ""
 	}
@@ -73,6 +111,9 @@ SectionDevice."Headphone".0 {
 
 SectionDevice."Mic".0 {
 	Value {
+		CapturePCM "hw:ROCKCHIPI2S,0"
+		MixerName "Headset Mic"
+		JackType "gpio"
 		JackName "ROCKCHIP-I2S Headset Jack"
 	}