ucm: Fix JackControl names

This resolves an issue with headphone insertion/removal occurs, but route
setting does not. Additionally, this sets the default initialization routes to
use the speaker and onboard mics.

Change-Id: I9699e909484b690346e9113b78e91451e933fff7
diff --git a/debian/changelog b/debian/changelog
index 98a2553..2811ae2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
-aiy-board-audio (0.1) UNRELEASED; urgency=medium
+aiy-board-audio (0.2) animal; urgency=medium
+
+  * Updates UCM rules and sets routes more correctly.
+
+ -- AIY Projects <support-aiyprojects@google.com>  Thu, Dec 06 2018 13:51:00 -0800
+
+aiy-board-audio (0.1) animal; urgency=medium
 
   * Initial release.
 
- -- June Tate-Gans <jtgans@google.com>  Mon, 04 Jun 2018 16:14:00 -0800
+ -- AIY Projects <support-aiyprojects@google.com>  Mon, 04 Jun 2018 16:14:00 -0800
diff --git a/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf b/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf
index 1d8ece7..d81ef13 100644
--- a/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf
+++ b/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf
@@ -33,7 +33,7 @@
 		cset "name='SPKVOL R Switch' on"
 		cset "name='SPOL MIX SPKVOL L Switch' on"
 		cset "name='SPOR MIX SPKVOL R Switch' on"
-		cset "name='Speaker Channel Switch' off"
+		cset "name='Speaker Channel Switch' on"
 		cset "name='Speaker Playback Volume' 100"
 
 		# Input Configuration
@@ -43,8 +43,8 @@
 		cset "name='RECMIXR BST2 Switch' on"
 		cset "name='Sto1 ADC MIXL ADC1 Switch' off"
 		cset "name='Sto1 ADC MIXR ADC1 Switch' off"
-		cset "name='Sto1 ADC MIXL ADC2 Switch' off"
-		cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+		cset "name='Sto1 ADC MIXL ADC2 Switch' on"
+		cset "name='Sto1 ADC MIXR ADC2 Switch' on"
 		cset "name='I2S2 Func Switch' off"
 		cset "name='Stereo1 ADC1 Mux' ADC"
 		cset "name='Stereo1 ADC2 Mux' DMIC"
@@ -63,7 +63,7 @@
 
 	Value {
 		PlaybackChannels "2"
-	CaptureChannels "2"
+		CaptureChannels "2"
 	}
 
 	ConflictingDevice [
@@ -87,13 +87,13 @@
 	]
 }
 
-SectionDevice."Headset".0 {
-	Comment "Headset"
+SectionDevice."Headphone".0 {
+	Comment "Headphone"
 
 	Value {
 		PlaybackChannels "2"
 		CaptureChannels "2"
-		JackControl "Headset Jack"
+		JackControl "Headphone Jack"
 		JackDev "/dev/input/by-path/platform-sound-rt5645-event"
 	}