ucm: Fix names to match with the driver

This changes the file and path names for the UCM rules to match up with
the information spit out by the ALSA driver. Effectively this makes the
UCM configs "exist" for pulseaudio.

This also removes and adjusts a few of the UCM rules to function
properly on the AIY board.

Change-Id: I2a887e296513844cd0afe24590688e54cc6656a9
diff --git a/usr/share/alsa/ucm/aiy-board-audio/HiFi.conf b/usr/share/alsa/ucm/rt5645-audio/HiFi.conf
similarity index 90%
rename from usr/share/alsa/ucm/aiy-board-audio/HiFi.conf
rename to usr/share/alsa/ucm/rt5645-audio/HiFi.conf
index 44988fc..4f7adec 100644
--- a/usr/share/alsa/ucm/aiy-board-audio/HiFi.conf
+++ b/usr/share/alsa/ucm/rt5645-audio/HiFi.conf
@@ -24,7 +24,7 @@
 		cset "name='HPOVOL L Switch' on"
 		cset "name='HPOVOL R Switch' on"
 		cset "name='HPO MIX HPVOL Switch' on"
-		cset "name='Headphone Switch' on"
+		cset "name='Headphone Channel Switch' on"
 		cset "name='Headphone Playback Volume' 75"
 
 		cset "name='SPK MIXL DAC L1 Switch' on"
@@ -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 Switch' on"
+		cset "name='Speaker Channel Switch' on"
 		cset "name='Speaker Playback Volume' 75"
 
 		# Input Configuration
@@ -41,10 +41,8 @@
 		cset "name='ADC Boost Capture Volume' 1,1"
 		cset "name='RECMIXL BST1 Switch' on"
 		cset "name='RECMIXR BST2 Switch' on"
-		# cset "name='Stereo ADC1 Mux' 'ADC'"
 		cset "name='Sto1 ADC MIXL ADC1 Switch' on"
 		cset "name='Sto1 ADC MIXR ADC1 Switch' on"
-		cset "name='Int Mic Switch' on"
 	]
 
 	DisableSequence [
@@ -92,13 +90,11 @@
 	EnableSequence [
 		cdev "hw:0"
 		cset "name='Headphone Channel Switch' on"
-		cset "name='Headphone Switch' on"
 	]
 
 	DisableSequence [
 		cdev "hw:0"
 		cset "name='Headphone Channel Switch' off"
-		cset "name='Headphone Switch' off"
 	]
 }
 
diff --git a/usr/share/alsa/ucm/aiy-board-audio/aiy-voicebonnet.conf b/usr/share/alsa/ucm/rt5645-audio/rt5645-audio.conf
similarity index 100%
rename from usr/share/alsa/ucm/aiy-board-audio/aiy-voicebonnet.conf
rename to usr/share/alsa/ucm/rt5645-audio/rt5645-audio.conf