From 68f94a1fa946e8a3035a7c2cc6c62058fd9b8070 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Tue, 27 Aug 2013 09:43:31 +0200
Subject: [PATCH 2/4] Add UCM config file for Galaxy Nexus (maguro)

---
 configure.ac                  |    1 +
 src/conf/ucm/Makefile.am      |    2 +-
 src/conf/ucm/Tuna/HiFi        |  354 +++++++++++++++++++++++++++++++++++++++++
 src/conf/ucm/Tuna/Makefile.am |    4 +
 src/conf/ucm/Tuna/Tuna.conf   |   14 ++
 src/conf/ucm/Tuna/VoiceCall   |  245 ++++++++++++++++++++++++++++
 6 files changed, 619 insertions(+), 1 deletion(-)
 create mode 100644 src/conf/ucm/Tuna/HiFi
 create mode 100644 src/conf/ucm/Tuna/Makefile.am
 create mode 100644 src/conf/ucm/Tuna/Tuna.conf
 create mode 100644 src/conf/ucm/Tuna/VoiceCall

Index: alsa-lib-1.1.2/src/conf/ucm/Tuna/HiFi
===================================================================
--- /dev/null
+++ alsa-lib-1.1.2/src/conf/ucm/Tuna/HiFi
@@ -0,0 +1,354 @@
+# Use case Configuration for TI Tuna HiFi audio playback and capture
+# By Liam Girdwood <lrg@ti.com>
+# Updated by Sebastien Jan <s-jan@ti.com>
+# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com>
+
+######### Main Verb Config #################
+
+SectionVerb {
+
+	EnableSequence [
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# Enable ABE playback path through DL1
+		cset "name='DL1 Mixer Multimedia' 1"
+		cset "name='Sidetone Mixer Playback' 1"
+		cset "name='DL1 PDM Switch' 1"
+
+		# set ABE playback gains to 0dB
+		cset "name='DL1 Media Playback Volume' 120"
+		cset "name='DL2 Media Playback Volume' 120"
+		cset "name='SDT DL Volume' 120"
+
+		# Enable ABE PDM-UL Capture path
+		cset "name='MUX_UL10' 11"
+		cset "name='MUX_UL11' 12"
+
+		# set ABE capture gains to 0dB
+		cset "name='AMIC UL Volume' 120"
+
+		# Disable Earpiece output, leave enabling to device enable
+		# sequence
+		cset "name='Earphone Enable Switch' 0"
+	]
+
+	DisableSequence [
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# Disable ABE playback path through DL1
+		cset "name='DL1 Mixer Multimedia' 0"
+		cset "name='Sidetone Mixer Playback' 0"
+		cset "name='DL1 PDM Switch' 0"
+
+		# mute ABE playback gains
+		cset "name='DL1 Media Playback Volume' 0"
+		cset "name='DL2 Media Playback Volume' 0"
+		cset "name='SDT DL Volume' 0"
+
+		# Disable ABE PDM-UL Capture path
+		cset "name='MUX_UL10' 0"
+		cset "name='MUX_UL11' 0"
+
+		# mute ABE capture gains
+		cset "name='AMIC UL Volume' 0"
+
+	]
+
+	# ALSA PCM
+	Value {
+
+		TQ "HiFi"
+
+		# ALSA PCM device for HiFi
+		PlaybackPCM "hw:Tuna,0"
+		CapturePCM "hw:Tuna,1"
+	}
+}
+
+###### Headset Devices Options ############
+
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+
+	# Headset is mutually exclusive to some devices
+	ConflictingDevice [
+		"Mainmic"
+		"Submic"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture Path
+		cset "name='Analog Left Capture Route' 0"
+		cset "name='Analog Right Capture Route' 0"
+		cset "name='Capture Preamplifier Volume' 2"
+
+		cset "name='Capture Volume' 4"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture path
+		cset "name='Analog Left Capture Route' 3"
+		cset "name='Analog Right Capture Route' 3"
+		cset "name='Capture Preamplifier Volume' 0"
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+###### Headphones Devices Options ############
+
+SectionDevice."Headphones" {
+	Comment "Tuna 3.5mm Headphones playback"
+
+	# Headphones is mutually exclusive to some devices
+	ConflictingDevice [
+		"Speaker"
+		"Earpiece"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 playback path
+		cset "name='HS Left Playback' 1"
+		cset "name='HS Right Playback' 1"
+
+		cset "name='Headset Playback Volume' 14"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		cset "name='Headset Playback Volume' 0"
+		# TWL6040 playback path
+		cset "name='HS Right Playback' 0"
+		cset "name='HS Left Playback' 0"
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+########### Earpiece Device Options ################
+
+SectionDevice."Earpiece" {
+	Comment "Earpiece playback"
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 playback path
+		cset "name='Earphone Enable Switch' 1"
+
+		cset "name='Earphone Enable Volume' 13"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		cset "name='Earphone Enable Volume' 0"
+
+		# TWL6040 playback path
+		cset "name='Earphone Enable Switch' 0"
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+########### Speaker Device Options ################
+
+SectionDevice."Speaker" {
+	Comment "Main speaker playback"
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Multimedia' 1"
+
+		# TWL6040 playback path
+		cset "name='HF Left Playback' 1"
+		cset "name='HF Right Playback' 1"
+
+		cset "name='Handsfree Playback Volume' 28"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		cset "name='Handsfree Playback Volume' 0"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Multimedia' 0"
+
+		# TWL6040 playback path
+		cset "name='HF Left Playback' 0"
+		cset "name='HF Right Playback' 0"
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+############ Main Mic Device #########################
+
+SectionDevice."Handset" {
+	Comment "Main Microphone Left Channel Capture"
+
+	ConflictingDevice [
+		"Headset"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture Path
+		cset "name='Analog Left Capture Route' 0"
+		cset "name='Capture Volume' 4"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture path
+		cset "name='Analog Left Capture Route' 3"
+	]
+
+	Value {
+		# Default ALSA volume gain and mute kcontrols
+		CaptureChannels "2"
+	}
+}
+
+############ Sub Mic Device #########################
+
+SectionDevice."Submic" {
+	Comment "Sub Microphone Right Channel Capture"
+
+	ConflictingDevice [
+		"Headset"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture Path
+		cset "name='Analog Right Capture Route' 1"
+
+		cset "name='Capture Volume' 4"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture path
+		cset "name='Analog Right Capture Route' 3"
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+##############  Play Tone Modifier ####################
+#
+# We have 2 PlayTone modifiers. Each one supports different devices as the
+# path configuration is different depending on the device being used when
+# the modifier is enabled.
+#
+
+SectionModifier."PlayTone" {
+	Comment "Play a ring tone or system sound"
+
+	# For the following devices we need to set the DL2 path
+	SupportedDevice [
+		"Headphones"
+		"Earpiece"
+	]
+
+	EnableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Tones' 1"
+		cset "name='DL2 Tones Playback Volume' 120"
+		cset "name='DL1 Mixer Tones' 1"
+		cset "name='DL1 Tones Playback Volume' 120"
+
+#		# TWL6040 playback path
+#		cset "name='HF Left Playback' 1"
+#		cset "name='HF Right Playback' 1"
+	]
+
+	DisableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Tones' 0"
+		cset "name='DL2 Tones Playback Volume' 0"
+		cset "name='DL1 Mixer Tones' 0"
+		cset "name='DL1 Tones Playback Volume' 0"
+
+#		# TWL6040 playback path
+#		cset "name='HF Left Playback' 0"
+#		cset "name='HF Right Playback' 0"
+	]
+
+	# QoS, Mixers and ALSA PCMs
+	Value {
+		TQ "Tones"
+		PlaybackPCM "hw:Tuna,3"
+		PlaybackVolume "name='DL2 Tones Playback Volume' 120"
+	}
+}
+
+SectionModifier."PlayTone" {
+	Comment "Play a ring tone or system sound"
+
+	# For the following devices we dont need to set the DL2 path
+	SupportedDevice [
+		"Speaker"
+	]
+
+	EnableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Tones' 1"
+		cset "name='DL2 Tones Playback Volume' 120"
+	]
+
+	DisableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		cset "name='DL2 Mixer Tones' 0"
+	]
+
+	# QoS, Mixers and ALSA PCMs
+	Value {
+		TQ "Tones"
+		PlaybackPCM "hw:Tuna,3"
+		PlaybackVolume "name='DL2 Tones Playback Volume' 120"
+	}
+}
+
Index: alsa-lib-1.1.2/src/conf/ucm/Tuna/Makefile.am
===================================================================
--- /dev/null
+++ alsa-lib-1.1.2/src/conf/ucm/Tuna/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/Tuna
+ucm_DATA = Tuna.conf HiFi VoiceCall
+EXTRA_DIST = $(ucm_DATA)
Index: alsa-lib-1.1.2/src/conf/ucm/Tuna/Tuna.conf
===================================================================
--- /dev/null
+++ alsa-lib-1.1.2/src/conf/ucm/Tuna/Tuna.conf
@@ -0,0 +1,14 @@
+# UCM configuration for SDP4430
+SectionUseCase."HiFi" {
+	File "HiFi"
+	Comment "Play HiFi quality Music"
+}
+
+SectionUseCase."Voice Call" {
+	File "VoiceCall"
+	Comment "Voice Phone Call"
+}
+
+SectionDefaults [
+	cdev "hw:Tuna"
+]
Index: alsa-lib-1.1.2/src/conf/ucm/Tuna/VoiceCall
===================================================================
--- /dev/null
+++ alsa-lib-1.1.2/src/conf/ucm/Tuna/VoiceCall
@@ -0,0 +1,245 @@
+# Use case Configuration for TI Tuna RF MODEM Voice Call
+# By Liam Girdwood <lrg@ti.com>
+# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com>
+
+SectionVerb {
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# Enable ABE sidetone paths at 0dB (needs tuned)
+		cset "name='Sidetone Mixer Capture' 1"
+		cset "name='Sidetone Mixer Playback' 1"
+		cset "name='SDT DL Volume' 120"
+		cset "name='SDT UL Volume' 120"
+
+		# Enable ABE DL1 Voice at 0dB
+		cset "name='DL1 Mixer Multimedia' 1"
+		cset "name='DL1 Mixer Voice' 1"
+		cset "name='DL1 Voice Playback Volume' 120"
+
+		# Only enabled for Speaker
+		cset "name='DL2 Mixer Multimedia' 0"
+		cset "name='DL2 Mixer Voice' 0"
+
+		# Disable DL2 Mono Mixer
+		cset "name='DL2 Mono Mixer' 0"
+
+		# Enable Uplink
+		cset "name='Voice Capture Mixer Capture' 1"
+
+		# Todo - Execute modem startup command if required.
+
+		# FIXME: Copying Handset enable here to allow the PCM to be
+		# opened. Better fix required, possibly driver-side.
+		# Enable ABE paths to PDM and AMIC
+		cset "name='DL1 PDM Switch' 1"
+		cset "name='MUX_VX0' 11"
+		cset "name='MUX_VX1' 12"
+
+		# set ABE capture gains to 0dB
+		cset "name='AMIC UL Volume' 120"
+
+		# TWL6040 playback path
+		cset "name='Earphone Enable Switch' 1"
+
+		# TWL6040 Capture Path with Main Mic and Sub Mic
+		cset "name='Analog Left Capture Route' 1"
+		cset "name='Analog Right Capture Route' 1"
+		cset "name='Capture Preamplifier Volume' 2"
+		# END OF FIXME
+
+		# Enable extra PCMs
+
+		# ABE Music playback path through DL1 at 0dB (tune this)
+		cset "name='DL1 Mixer Multimedia' 1"
+		cset "name='DL1 Media Playback Volume' 120"
+
+		# Enable VX_REC for call capture at 0dB
+		cset "name='Capture Mixer Voice Playback' 1"
+		cset "name='Capture Mixer Voice Capture' 1"
+		cset "name='VXREC Voice UL Volume' 120"
+		cset "name='VXREC Voice DL Volume' 120"
+
+		# set ROUTE_UL path
+		cset "name='MUX_UL10' 13"
+		cset "name='MUX_UL11' 14"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# Disable Extra PCMs
+
+		# Enable VX_REC for call capture at 0dB
+		cset "name='Capture Mixer Voice Playback' 0"
+		cset "name='Capture Mixer Voice Capture' 0"
+		cset "name='VXREC Voice UL Volume' 0"
+		cset "name='VXREC Voice DL Volume' 0"
+
+		# set ROUTE_UL path
+		cset "name='MUX_UL10' 0"
+		cset "name='MUX_UL11' 0"
+
+		# disable ABE Music path to near end
+		cset "name='DL1 Mixer Tones' 0"
+		cset "name='DL1 Tones Playback Volume' 0"
+
+		# ABE mute tone playback path through DL2
+		cset "name='DL2 Mixer Tones' 0"
+		cset "name='DL2 Tones Playback Volume' 0"
+
+		# Todo - Execute modem shutdown command if required.
+
+		# Disable ABE sidetone paths and mute (needs tuned)
+		cset "name='Sidetone Mixer Capture' 0"
+		cset "name='Sidetone Mixer Playback' 0"
+		cset "name='SDT DL Volume' 0"
+		cset "name='SDT UL Volume' 0"
+
+		# Disable ABE DL1 Voice and mute
+		cset "name='DL1 Mixer Voice' 0"
+		cset "name='DL1 Voice Playback Volume' 0"
+
+		# Enable DL2 Multimedia
+		cset "name='DL2 Mixer Multimedia' 1"
+
+		# Enable DL2 Mono Mixer
+		cset "name='DL2 Mono Mixer' 1"
+
+		# Disable Uplink
+		cset "name='Voice Capture Mixer Capture' 0"
+
+		# FIXME: Copying Handset disable here to allow the PCM to be
+		# opened. Better fix required, possibly driver-side.
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# Enable ABE paths
+		cset "name='DL1 PDM Switch' 0"
+		cset "name='MUX_VX0' 0"
+		cset "name='MUX_VX1' 0"
+
+		# mute ABE capture gains
+		cset "name='AMIC UL Volume' 120"
+
+		# TWL6040 playback path
+		cset "name='HS Right Playback' 0"
+		cset "name='HS Left Playback' 0"
+
+		# TWL6040 Capture path
+		cset "name='Analog Left Capture Route' 3"
+		cset "name='Analog Right Capture Route' 3"
+		cset "name='Capture Preamplifier Volume' 0"
+		# END OF FIXME
+	]
+
+	# QoS and ALSA PCMs
+	Value {
+		TQ "Voice"
+
+		CapturePCM "hw:Tuna,1"
+		PlaybackPCM "hw:Tuna,0"
+	}
+}
+
+SectionDevice."Earpiece" {
+	#Name "Earpiece"
+	Comment "Earpiece output"
+
+	# FIXME
+	ConflictingDevice [
+		"Headphones"
+		"Speaker"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+SectionDevice."Headphones" {
+	#Name "Earpiece"
+	Comment "Headphone output"
+
+	# FIXME
+	ConflictingDevice [
+		"Earpiece"
+		"Speaker"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+SectionDevice."Speaker" {
+	#Name "Earpiece"
+	Comment "Speaker output"
+
+	# FIXME
+	ConflictingDevice [
+		"Earpiece"
+		"Headphones"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+
+SectionDevice."Handset" {
+	Comment "Main mic input"
+
+	# FIXME
+	ConflictingDevice [
+		"Headset"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+SectionDevice."Headset" {
+	Comment "Headset mic input"
+
+	# FIXME
+	ConflictingDevice [
+		"Handset"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+
+
+
Index: alsa-lib-1.1.2/configure.ac
===================================================================
--- alsa-lib-1.1.2.orig/configure.ac
+++ alsa-lib-1.1.2/configure.ac
@@ -678,6 +678,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict
 	  src/conf/ucm/chtrt5645/Makefile \
 	  src/conf/ucm/DB410c/Makefile \
 	  src/conf/ucm/apq8064-tabla-snd-card/Makefile \
+	  src/conf/ucm/Tuna/Makefile \
 	  src/conf/topology/Makefile \
 	  src/conf/topology/broadwell/Makefile \
 	  modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
Index: alsa-lib-1.1.2/src/conf/ucm/Makefile.am
===================================================================
--- alsa-lib-1.1.2.orig/src/conf/ucm/Makefile.am
+++ alsa-lib-1.1.2/src/conf/ucm/Makefile.am
@@ -1 +1 @@
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c apq8064-tabla-snd-card
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c apq8064-tabla-snd-card Tuna