pool/alsa-ucm-conf
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ff96cb1302
alsa-ucm-conf/0027-SDP4430-Move-to-OMAP-abe-twl6040-SDP4430-tree.patch
Takashi Iwai 899638c0ac Accepting request 835804 from home:tiwai:test:sdw 
- Update from alsa-ucm-conf git (commit 3048ff7b15a9):
  mainly for adding the support for sof-soundwire (bsc#1176200):
  0001-bytcr-rt5640-Fix-DMIC1-not-working-when-connected-ov.patch
  0002-bytcr-rt5651-Fix-high-noise-level-soft-input-on-DMIC.patch
  0003-chtrt5645-Add-ASUSTeKCOMPUTERINC.-T101HA-1.0.conf-sy.patch
  0004-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch
  0005-ucm2-use-Include-Syntax-3.patch
  0006-chtrt5645-merge-all-possible-configurations-to-HiFi..patch
  0007-cht-bsw-rt5672-merge-all-possible-configurations-to-.patch
  0008-chtnau8824-merge-all-possible-configurations-to-HiFi.patch
  0009-ucm.conf-add-support-for-the-kernel-module-name-tree.patch
  0010-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch
  0011-sof-hda-dsp-add-initial-kcontrol-values.patch
  0012-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch
  0013-bdw-rt5677-add-support-for-legacy-and-SOF-drivers.patch
  0014-broadwell-rt286-add-SOF-support.patch
  0015-sof-soundwire-initial-UCM2-version.patch
  0016-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch
  0017-sof-soundwire-rewrite-for-syntax-3.patch
  0018-sof-hda-dsp-fix-the-device-order-Hdmi-devices.patch
  0019-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch
  0020-DAISY-I2S-move-to-Samsung-snow-snow.conf.patch
  0021-DB410c-move-to-Qualcomm-apq8016-sbc.patch
  0022-DB820c-DB845c-move-to-Qualcomm-tree.patch
  0023-PAZ00-tegraalc5632-move-to-Tegra-alc5632-tree.patch
  0024-VEYRON-I2C-move-to-Rockchip-max98090-tree.patch
  0025-Pandaboard-ES-move-to-OMAP-abe-twl6040-tree.patch
  0026-GoogleNyan-move-to-Tegra-max98090.patch
  0027-SDP4430-Move-to-OMAP-abe-twl6040-SDP4430-tree.patch
  0028-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch

OBS-URL: https://build.opensuse.org/request/show/835804
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=17
2020-09-21 11:44:29 +00:00

1623 lines
42 KiB
Diff
Raw Blame History

From 415b126f2ac372598f8af480f0b76da99df27d7d Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 25 Jun 2020 17:43:40 +0200
Subject: [PATCH 27/51] SDP4430: Move to OMAP/abe-twl6040/SDP4430 tree
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/OMAP/abe-twl6040/FMAnalog.conf | 45 ----------------
ucm2/OMAP/abe-twl6040/HiFi.conf | 56 --------------------
ucm2/OMAP/abe-twl6040/HiFiLP.conf | 46 ----------------
ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf | 45 ++++++++++++++++
ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf | 56 ++++++++++++++++++++
ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf | 46 ++++++++++++++++
ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf | 41 +++++++++++++++
ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf | 47 +++++++++++++++++
ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf | 46 ++++++++++++++++
ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf | 67 ++++++++++++++++++++++++
ucm2/OMAP/abe-twl6040/Record.conf | 47 -----------------
ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf | 40 ++++++++++++++
ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf | 57 ++++++++++++++++++++
ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf | 45 ++++++++++++++++
ucm2/OMAP/abe-twl6040/SDP4430/Record.conf | 45 ++++++++++++++++
ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf | 41 +++++++++++++++
ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf | 45 ++++++++++++++++
ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf | 66 +++++++++++++++++++++++
ucm2/OMAP/abe-twl6040/Voice.conf | 46 ----------------
ucm2/OMAP/abe-twl6040/VoiceCall.conf | 67 ------------------------
ucm2/OMAP/abe-twl6040/abe-twl6040.conf | 50 ++++--------------
ucm2/SDP4430/FMAnalog.conf | 40 --------------
ucm2/SDP4430/HiFi.conf | 57 --------------------
ucm2/SDP4430/HiFiLP.conf | 45 ----------------
ucm2/SDP4430/Record.conf | 45 ----------------
ucm2/SDP4430/SDP4430.conf | 43 ---------------
ucm2/SDP4430/Voice.conf | 45 ----------------
ucm2/SDP4430/VoiceCall.conf | 66 -----------------------
28 files changed, 697 insertions(+), 688 deletions(-)
delete mode 100644 ucm2/OMAP/abe-twl6040/FMAnalog.conf
delete mode 100644 ucm2/OMAP/abe-twl6040/HiFi.conf
delete mode 100644 ucm2/OMAP/abe-twl6040/HiFiLP.conf
create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf
create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf
create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf
create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf
create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf
create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf
create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf
delete mode 100644 ucm2/OMAP/abe-twl6040/Record.conf
create mode 100644 ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf
create mode 100644 ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf
create mode 100644 ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf
create mode 100644 ucm2/OMAP/abe-twl6040/SDP4430/Record.conf
create mode 100644 ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf
create mode 100644 ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf
create mode 100644 ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf
delete mode 100644 ucm2/OMAP/abe-twl6040/Voice.conf
delete mode 100644 ucm2/OMAP/abe-twl6040/VoiceCall.conf
delete mode 100644 ucm2/SDP4430/FMAnalog.conf
delete mode 100644 ucm2/SDP4430/HiFi.conf
delete mode 100644 ucm2/SDP4430/HiFiLP.conf
delete mode 100644 ucm2/SDP4430/Record.conf
delete mode 100644 ucm2/SDP4430/SDP4430.conf
delete mode 100644 ucm2/SDP4430/Voice.conf
delete mode 100644 ucm2/SDP4430/VoiceCall.conf
diff --git a/ucm2/OMAP/abe-twl6040/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/FMAnalog.conf
deleted file mode 100644
index fa819771d6a1..000000000000
--- a/ucm2/OMAP/abe-twl6040/FMAnalog.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# Use case Configurationfor TI PandaBoard(ES) HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='AMIC_UL PDM Switch' 1"
- cset "name='MUX_UL00' 9"
- cset "name='MUX_UL01' 10"
- cset "name='Capture Volume' 4"
- ]
-
-
- DisableSequence [
- cset "name='AMIC_UL PDM Switch' 0"
- cset "name='MUX_UL00' 0"
- cset "name='MUX_UL01' 0"
- cset "name='Capture Volume' 0"
- ]
-
- # Optional TQ
- Value {
- TQ "Music"
- }
-}
-
-SectionDevice."Headset" {
- Comment "3.5mm Headset"
-
- EnableSequence [
- cset "name='Analog Left Capture Route' 2"
- cset "name='Analog Right Capture Route' 2"
- cset "name='Capture Preamplifier Volume' 2"
- ]
-
- DisableSequence [
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- ]
-
- Value {
- CapturePriority 100
- CapturePCM "hw:${CardId}"
- }
-}
diff --git a/ucm2/OMAP/abe-twl6040/HiFi.conf b/ucm2/OMAP/abe-twl6040/HiFi.conf
deleted file mode 100644
index 597c32621c81..000000000000
--- a/ucm2/OMAP/abe-twl6040/HiFi.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-# Use case Configuration for TI PandaBoard(ES) HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Media Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
-
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Media Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
-
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- # Optional TQ
- Value {
- TQ "Music"
- }
-}
-
-SectionDevice."Headset" {
- Comment "3.5mm Headset"
-
- EnableSequence [
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId}"
- # PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
- # PlaybackSwitch "name='DL1 PDM Switch' 1"
- }
-}
diff --git a/ucm2/OMAP/abe-twl6040/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/HiFiLP.conf
deleted file mode 100644
index 481f2384daf5..000000000000
--- a/ucm2/OMAP/abe-twl6040/HiFiLP.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Use case Configuration for TI PandaBoard(ES) HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Media Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
- ]
-
- DisableSequence [
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Media Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
- ]
-
- # Optional TQ
- Value {
- TQ "Music"
- }
-}
-
-SectionDevice."Headset" {
- Comment "3.5mm Headset"
-
- EnableSequence [
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId},6"
- }
-}
diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf
new file mode 100644
index 000000000000..fa819771d6a1
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf
@@ -0,0 +1,45 @@
+# Use case Configurationfor TI PandaBoard(ES) HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='AMIC_UL PDM Switch' 1"
+ cset "name='MUX_UL00' 9"
+ cset "name='MUX_UL01' 10"
+ cset "name='Capture Volume' 4"
+ ]
+
+
+ DisableSequence [
+ cset "name='AMIC_UL PDM Switch' 0"
+ cset "name='MUX_UL00' 0"
+ cset "name='MUX_UL01' 0"
+ cset "name='Capture Volume' 0"
+ ]
+
+ # Optional TQ
+ Value {
+ TQ "Music"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Analog Left Capture Route' 2"
+ cset "name='Analog Right Capture Route' 2"
+ cset "name='Capture Preamplifier Volume' 2"
+ ]
+
+ DisableSequence [
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId}"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf
new file mode 100644
index 000000000000..597c32621c81
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf
@@ -0,0 +1,56 @@
+# Use case Configuration for TI PandaBoard(ES) HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ # Optional TQ
+ Value {
+ TQ "Music"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId}"
+ # PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
+ # PlaybackSwitch "name='DL1 PDM Switch' 1"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf
new file mode 100644
index 000000000000..481f2384daf5
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf
@@ -0,0 +1,46 @@
+# Use case Configuration for TI PandaBoard(ES) HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+ ]
+
+ DisableSequence [
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+ ]
+
+ # Optional TQ
+ Value {
+ TQ "Music"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId},6"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf
new file mode 100644
index 000000000000..1a19f969de1a
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf
@@ -0,0 +1,41 @@
+# UCM configuration for PandaBoard(ES)
+
+SectionUseCase."Record" {
+ File "/OMAP/abe-twl6040/Pandaboard/Record.conf"
+ Comment "Record"
+}
+
+SectionUseCase."HiFi" {
+ File "/OMAP/abe-twl6040/Pandaboard/HiFi.conf"
+ Comment "Play HiFi quality Music"
+}
+
+SectionUseCase."HiFi_Low_Power" {
+ File "/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf"
+ Comment "Play HiFi quality Music in Low Power Mode"
+}
+
+SectionUseCase."Voice" {
+ File "/OMAP/abe-twl6040/Pandaboard/Voice.conf"
+ Comment "Playback Voice quality"
+}
+
+SectionUseCase."Voice_Low_Power" {
+ File "/OMAP/abe-twl6040/Pandaboard/Voice.conf"
+ Comment "Playback Voice quality in Low Power Mode"
+}
+
+SectionUseCase."Voice_Call" {
+ File "/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf"
+ Comment "Capture and Playback in Voice quality"
+}
+
+SectionUseCase."Voice_Call_IP" {
+ File "/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf"
+ Comment "Capture and Playback in Voice quality"
+}
+
+SectionUseCase."FM_Analog_Radio" {
+ File "/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf"
+ Comment "Capture FM Analog Radio"
+}
diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf
new file mode 100644
index 000000000000..042e5cea53ee
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf
@@ -0,0 +1,47 @@
+# Use case Configuration for TI PandaBoard(ES) HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ # No more AMIC PDM Switch in current kernels
+ #cset "name='AMIC_UL PDM Switch' 1"
+ cset "name='MUX_UL00' 9"
+ cset "name='MUX_UL01' 10"
+ cset "name='Capture Volume' 4"
+ ]
+
+ DisableSequence [
+ # No more AMIC PDM Switch in current kernels
+ #cset "name='AMIC_UL PDM Switch' 0"
+ cset "name='MUX_UL00' 0"
+ cset "name='MUX_UL01' 0"
+ cset "name='Capture Volume' 0"
+ ]
+
+ # Optional TQ
+ Value {
+ TQ "Music"
+ }
+
+}
+
+SectionDevice."Headset" {
+ Comment "3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Analog Right Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
+ ]
+
+ DisableSequence [
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId}"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf
new file mode 100644
index 000000000000..3eaffb4f1e73
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf
@@ -0,0 +1,46 @@
+# Use case Configuration for TI PandaBoard(ES) HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='DL1 Mixer Voice' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Voice Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+ ]
+
+ DisableSequence [
+ cset "name='DL1 Mixer Voice' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Voice Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+ ]
+
+ # Optional TQ
+ Value {
+ TQ "Voice"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId},2"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf
new file mode 100644
index 000000000000..4e82e7af093c
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf
@@ -0,0 +1,67 @@
+# Use case Configuration for TI PandaBoard(ES) HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='AMIC_UL PDM Switch' 1"
+ cset "name='Sidetone Mixer Capture' 1"
+ cset "name='MUX_VX0' 9"
+ cset "name='MUX_VX1' 10"
+ cset "name='DL1 Mixer Voice' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Voice Playback Volume' 90,90"
+ cset "name='Capture Volume' 4"
+ cset "name='Capture Mixer Voice Capture' 90,90"
+ cset "name='SDT DL Volume' 120"
+ ]
+
+
+ DisableSequence [
+ cset "name='AMIC_UL PDM Switch' 0"
+ cset "name='Sidetone Mixer Capture' 0"
+ cset "name='MUX_VX0' 0"
+ cset "name='MUX_VX1' 0"
+ cset "name='DL1 Mixer Voice' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Voice Playback Volume' 0,0"
+ cset "name='Capture Volume' 0"
+ cset "name='DL1 Voice Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+ ]
+
+ # Optional TQ
+ Value {
+ TQ "Voice"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Analog Right Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId},2"
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId},2"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/Record.conf b/ucm2/OMAP/abe-twl6040/Record.conf
deleted file mode 100644
index 042e5cea53ee..000000000000
--- a/ucm2/OMAP/abe-twl6040/Record.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-# Use case Configuration for TI PandaBoard(ES) HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- # No more AMIC PDM Switch in current kernels
- #cset "name='AMIC_UL PDM Switch' 1"
- cset "name='MUX_UL00' 9"
- cset "name='MUX_UL01' 10"
- cset "name='Capture Volume' 4"
- ]
-
- DisableSequence [
- # No more AMIC PDM Switch in current kernels
- #cset "name='AMIC_UL PDM Switch' 0"
- cset "name='MUX_UL00' 0"
- cset "name='MUX_UL01' 0"
- cset "name='Capture Volume' 0"
- ]
-
- # Optional TQ
- Value {
- TQ "Music"
- }
-
-}
-
-SectionDevice."Headset" {
- Comment "3.5mm Headset"
-
- EnableSequence [
- cset "name='Analog Left Capture Route' 0"
- cset "name='Analog Right Capture Route' 0"
- cset "name='Capture Preamplifier Volume' 2"
- ]
-
- DisableSequence [
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- ]
-
- Value {
- CapturePriority 100
- CapturePCM "hw:${CardId}"
- }
-}
diff --git a/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf
new file mode 100644
index 000000000000..822f3d8b3070
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf
@@ -0,0 +1,40 @@
+# Use case Configuratio
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='AMIC_UL PDM Switch' 1"
+ cset "name='MUX_UL00' 9"
+ cset "name='MUX_UL01' 10"
+ cset "name='Capture Volume' 4"
+ ]
+
+ DisableSequence [
+ cset "name='AMIC_UL PDM Switch' 0"
+ cset "name='MUX_UL00' 0"
+ cset "name='MUX_UL01' 0"
+ cset "name='Capture Volume' 0"
+ ]
+}
+
+SectionDevice."Headset" {
+ Comment "SDP4430 3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Analog Left Capture Route' 2"
+ cset "name='Analog Right Capture Route' 2"
+ cset "name='Capture Preamplifier Volume' 2"
+ ]
+
+ DisableSequence [
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId}"
+ }
+}
+
diff --git a/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf b/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf
new file mode 100644
index 000000000000..6d4a8ae53f4e
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf
@@ -0,0 +1,57 @@
+# Use case Configuration for TI SDP4430 HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+
+ cset "name='HS Left Playback' 1"
+ cset "name='HS Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ cset "name='HS Right Playback' 0"
+ cset "name='HS Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ # Optional TQ and ALSA PCMs
+# Value {
+# TQ "Music"
+# PlaybackPCM "hw:${CardId},0"
+# PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
+# PlaybackSwitch "name='DL1 PDM Switch' 1"
+# }
+}
+
+SectionDevice."Headset" {
+ Comment "SDP4430 3.5mm Headset"
+
+ EnableSequence [
+ cset "name='HS Left Playback' 1"
+ cset "name='HS Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='HS Right Playback' 0"
+ cset "name='HS Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId}"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf
new file mode 100644
index 000000000000..4cb8b1d38ce7
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf
@@ -0,0 +1,45 @@
+# Use case Configuration for TI SDP4430 HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+ ]
+
+ DisableSequence [
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+ ]
+
+ Value {
+ TQ "Music"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "SDP4430 3.5mm Headset"
+
+ EnableSequence [
+ cset "name='HS Left Playback' 1"
+ cset "name='HS Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='HS Right Playback' 0"
+ cset "name='HS Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId},6"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf b/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf
new file mode 100644
index 000000000000..1763781b0e84
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf
@@ -0,0 +1,45 @@
+# Use case Configuration for TI SDP4430 HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='AMIC_UL PDM Switch' 1"
+ cset "name='MUX_UL00' 9"
+ cset "name='MUX_UL01' 10"
+ cset "name='Capture Volume' 4"
+ ]
+
+ DisableSequence [
+ cset "name='AMIC_UL PDM Switch' 0"
+ cset "name='MUX_UL00' 0"
+ cset "name='MUX_UL01' 0"
+ cset "name='Capture Volume' 0"
+ ]
+
+ # Optional TQ and ALSA PCMs
+ Value {
+ TQ "Music"
+ }
+
+}
+
+SectionDevice."Headset" {
+ Comment "SDP4430 3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Analog Right Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
+ ]
+
+ DisableSequence [
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId}"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf b/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf
new file mode 100644
index 000000000000..6ffd87469c34
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf
@@ -0,0 +1,41 @@
+# UCM configuration for SDP4430
+
+SectionUseCase."Record" {
+ File "/OMAP/abe-twl6040/SDP4430/Record.conf"
+ Comment "Record"
+}
+
+SectionUseCase."HiFi" {
+ File "/OMAP/abe-twl6040/SDP4430/HiFi.conf"
+ Comment "Play HiFi quality Music"
+}
+
+SectionUseCase."HiFi_Low_Power" {
+ File "/OMAP/abe-twl6040/SDP4430/HiFiLP.conf"
+ Comment "Play HiFi quality Music in Low Power Mode"
+}
+
+SectionUseCase."Voice" {
+ File "/OMAP/abe-twl6040/SDP4430/Voice.conf"
+ Comment "Playback Voice quality"
+}
+
+SectionUseCase."Voice_Low_Power" {
+ File "/OMAP/abe-twl6040/SDP4430/Voice.conf"
+ Comment "Playback Voice quality in Low Power Mode."
+}
+
+SectionUseCase."Voice_Call" {
+ File "/OMAP/abe-twl6040/SDP4430/VoiceCall.conf"
+ Comment "Capture and Playback in Voice quality"
+}
+
+SectionUseCase."Voice_Call_IP" {
+ File "/OMAP/abe-twl6040/SDP4430/VoiceCall.conf"
+ Comment "Capture and Playback in Voice quality"
+}
+
+SectionUseCase."FM_Analog_Radio" {
+ File "/OMAP/abe-twl6040/SDP4430/FMAnalog.conf"
+ Comment "Capture FM Analog Radio"
+}
diff --git a/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf b/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf
new file mode 100644
index 000000000000..57f45549d31f
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf
@@ -0,0 +1,45 @@
+# Use case Configuration for TI SDP4430 HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='DL1 Mixer Voice' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Voice Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+ ]
+
+ DisableSequence [
+ cset "name='DL1 Mixer Voice' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Voice Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+ ]
+
+ Value {
+ TQ "Voice"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "SDP4430 3.5mm Headset"
+
+ EnableSequence [
+ cset "name='HS Left Playback' 1"
+ cset "name='HS Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='HS Right Playback' 0"
+ cset "name='HS Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId},2"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf
new file mode 100644
index 000000000000..adf62ea25aa7
--- /dev/null
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf
@@ -0,0 +1,66 @@
+# Use case Configuration for TI SDP4430 HiFi Music
+# By Liam Girdwood <lrg@slimlogic.co.uk>
+
+SectionVerb {
+ EnableSequence [
+ cset "name='AMIC_UL PDM Switch' 1"
+ cset "name='Sidetone Mixer Capture' 1"
+ cset "name='MUX_VX0' 9"
+ cset "name='MUX_VX1' 10"
+ cset "name='DL1 Mixer Voice' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Voice Playback Volume' 90,90"
+ cset "name='Capture Volume' 4"
+ cset "name='Capture Mixer Voice Capture' 90,90"
+ cset "name='SDT DL Volume' 120"
+ ]
+
+
+ DisableSequence [
+ cset "name='AMIC_UL PDM Switch' 0"
+ cset "name='Sidetone Mixer Capture' 0"
+ cset "name='MUX_VX0' 0"
+ cset "name='MUX_VX1' 0"
+ cset "name='DL1 Mixer Voice' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Voice Playback Volume' 0,0"
+ cset "name='Capture Volume' 0"
+ cset "name='DL1 Voice Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+ ]
+
+ Value {
+ TQ "Voice"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "SDP4430 3.5mm Headset"
+
+ EnableSequence [
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Analog Right Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
+ cset "name='HS Left Playback' 1"
+ cset "name='HS Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+ ]
+
+ DisableSequence [
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ cset "name='HS Right Playback' 0"
+ cset "name='HS Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId},2"
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId},2"
+ }
+}
diff --git a/ucm2/OMAP/abe-twl6040/Voice.conf b/ucm2/OMAP/abe-twl6040/Voice.conf
deleted file mode 100644
index 3eaffb4f1e73..000000000000
--- a/ucm2/OMAP/abe-twl6040/Voice.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Use case Configuration for TI PandaBoard(ES) HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='DL1 Mixer Voice' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Voice Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
- ]
-
- DisableSequence [
- cset "name='DL1 Mixer Voice' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Voice Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
- ]
-
- # Optional TQ
- Value {
- TQ "Voice"
- }
-}
-
-SectionDevice."Headset" {
- Comment "3.5mm Headset"
-
- EnableSequence [
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId},2"
- }
-}
diff --git a/ucm2/OMAP/abe-twl6040/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/VoiceCall.conf
deleted file mode 100644
index 4e82e7af093c..000000000000
--- a/ucm2/OMAP/abe-twl6040/VoiceCall.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# Use case Configuration for TI PandaBoard(ES) HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='AMIC_UL PDM Switch' 1"
- cset "name='Sidetone Mixer Capture' 1"
- cset "name='MUX_VX0' 9"
- cset "name='MUX_VX1' 10"
- cset "name='DL1 Mixer Voice' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Voice Playback Volume' 90,90"
- cset "name='Capture Volume' 4"
- cset "name='Capture Mixer Voice Capture' 90,90"
- cset "name='SDT DL Volume' 120"
- ]
-
-
- DisableSequence [
- cset "name='AMIC_UL PDM Switch' 0"
- cset "name='Sidetone Mixer Capture' 0"
- cset "name='MUX_VX0' 0"
- cset "name='MUX_VX1' 0"
- cset "name='DL1 Mixer Voice' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Voice Playback Volume' 0,0"
- cset "name='Capture Volume' 0"
- cset "name='DL1 Voice Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
- ]
-
- # Optional TQ
- Value {
- TQ "Voice"
- }
-}
-
-SectionDevice."Headset" {
- Comment "3.5mm Headset"
-
- EnableSequence [
- cset "name='Analog Left Capture Route' 0"
- cset "name='Analog Right Capture Route' 0"
- cset "name='Capture Preamplifier Volume' 2"
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- CapturePriority 100
- CapturePCM "hw:${CardId},2"
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId},2"
- }
-}
diff --git a/ucm2/OMAP/abe-twl6040/abe-twl6040.conf b/ucm2/OMAP/abe-twl6040/abe-twl6040.conf
index 199408f875fd..5184211fdac5 100644
--- a/ucm2/OMAP/abe-twl6040/abe-twl6040.conf
+++ b/ucm2/OMAP/abe-twl6040/abe-twl6040.conf
@@ -1,43 +1,13 @@
# UCM configuration for PandaBoard(ES)
-Syntax 2
-
-SectionUseCase."Record" {
- File "/OMAP/abe-twl6040/Record.conf"
- Comment "Record"
-}
-
-SectionUseCase."HiFi" {
- File "/OMAP/abe-twl6040/HiFi.conf"
- Comment "Play HiFi quality Music"
-}
-
-SectionUseCase."HiFi_Low_Power" {
- File "/OMAP/abe-twl6040/HiFiLP.conf"
- Comment "Play HiFi quality Music in Low Power Mode"
-}
-
-SectionUseCase."Voice" {
- File "/OMAP/abe-twl6040/Voice.conf"
- Comment "Playback Voice quality"
-}
-
-SectionUseCase."Voice_Low_Power" {
- File "/OMAP/abe-twl6040/Voice.conf"
- Comment "Playback Voice quality in Low Power Mode"
-}
-
-SectionUseCase."Voice_Call" {
- File "/OMAP/abe-twl6040/VoiceCall.conf"
- Comment "Capture and Playback in Voice quality"
-}
-
-SectionUseCase."Voice_Call_IP" {
- File "/OMAP/abe-twl6040/VoiceCall.conf"
- Comment "Capture and Playback in Voice quality"
-}
-
-SectionUseCase."FM_Analog_Radio" {
- File "/OMAP/abe-twl6040/FMAnalog.conf"
- Comment "Capture FM Analog Radio"
+Syntax 3
+
+If.sdp4430 {
+ Condition {
+ Type String
+ String1 "${CardName}"
+ String2 "SDP4430"
+ }
+ True.Include.sdp4430.File "/OMAP/abe-twl6040/SDP4430/SDP4430.conf"
+ False.Include.pandaboard.File "/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf"
}
diff --git a/ucm2/SDP4430/FMAnalog.conf b/ucm2/SDP4430/FMAnalog.conf
deleted file mode 100644
index 822f3d8b3070..000000000000
--- a/ucm2/SDP4430/FMAnalog.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Use case Configuratio
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='AMIC_UL PDM Switch' 1"
- cset "name='MUX_UL00' 9"
- cset "name='MUX_UL01' 10"
- cset "name='Capture Volume' 4"
- ]
-
- DisableSequence [
- cset "name='AMIC_UL PDM Switch' 0"
- cset "name='MUX_UL00' 0"
- cset "name='MUX_UL01' 0"
- cset "name='Capture Volume' 0"
- ]
-}
-
-SectionDevice."Headset" {
- Comment "SDP4430 3.5mm Headset"
-
- EnableSequence [
- cset "name='Analog Left Capture Route' 2"
- cset "name='Analog Right Capture Route' 2"
- cset "name='Capture Preamplifier Volume' 2"
- ]
-
- DisableSequence [
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- ]
-
- Value {
- CapturePriority 100
- CapturePCM "hw:${CardId}"
- }
-}
-
diff --git a/ucm2/SDP4430/HiFi.conf b/ucm2/SDP4430/HiFi.conf
deleted file mode 100644
index 6d4a8ae53f4e..000000000000
--- a/ucm2/SDP4430/HiFi.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-# Use case Configuration for TI SDP4430 HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Media Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
-
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Media Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
-
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- # Optional TQ and ALSA PCMs
-# Value {
-# TQ "Music"
-# PlaybackPCM "hw:${CardId},0"
-# PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
-# PlaybackSwitch "name='DL1 PDM Switch' 1"
-# }
-}
-
-SectionDevice."Headset" {
- Comment "SDP4430 3.5mm Headset"
-
- EnableSequence [
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId}"
- }
-}
diff --git a/ucm2/SDP4430/HiFiLP.conf b/ucm2/SDP4430/HiFiLP.conf
deleted file mode 100644
index 4cb8b1d38ce7..000000000000
--- a/ucm2/SDP4430/HiFiLP.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# Use case Configuration for TI SDP4430 HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Media Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
- ]
-
- DisableSequence [
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Media Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
- ]
-
- Value {
- TQ "Music"
- }
-}
-
-SectionDevice."Headset" {
- Comment "SDP4430 3.5mm Headset"
-
- EnableSequence [
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId},6"
- }
-}
diff --git a/ucm2/SDP4430/Record.conf b/ucm2/SDP4430/Record.conf
deleted file mode 100644
index 1763781b0e84..000000000000
--- a/ucm2/SDP4430/Record.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# Use case Configuration for TI SDP4430 HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='AMIC_UL PDM Switch' 1"
- cset "name='MUX_UL00' 9"
- cset "name='MUX_UL01' 10"
- cset "name='Capture Volume' 4"
- ]
-
- DisableSequence [
- cset "name='AMIC_UL PDM Switch' 0"
- cset "name='MUX_UL00' 0"
- cset "name='MUX_UL01' 0"
- cset "name='Capture Volume' 0"
- ]
-
- # Optional TQ and ALSA PCMs
- Value {
- TQ "Music"
- }
-
-}
-
-SectionDevice."Headset" {
- Comment "SDP4430 3.5mm Headset"
-
- EnableSequence [
- cset "name='Analog Left Capture Route' 0"
- cset "name='Analog Right Capture Route' 0"
- cset "name='Capture Preamplifier Volume' 2"
- ]
-
- DisableSequence [
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- ]
-
- Value {
- CapturePriority 100
- CapturePCM "hw:${CardId}"
- }
-}
diff --git a/ucm2/SDP4430/SDP4430.conf b/ucm2/SDP4430/SDP4430.conf
deleted file mode 100644
index fd958903f290..000000000000
--- a/ucm2/SDP4430/SDP4430.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# UCM configuration for SDP4430
-
-Syntax 2
-
-SectionUseCase."Record" {
- File "Record.conf"
- Comment "Record"
-}
-
-SectionUseCase."HiFi" {
- File "HiFi.conf"
- Comment "Play HiFi quality Music"
-}
-
-SectionUseCase."HiFi_Low_Power" {
- File "HiFiLP.conf"
- Comment "Play HiFi quality Music in Low Power Mode"
-}
-
-SectionUseCase."Voice" {
- File "Voice.conf"
- Comment "Playback Voice quality"
-}
-
-SectionUseCase."Voice_Low_Power" {
- File "Voice.conf"
- Comment "Playback Voice quality in Low Power Mode."
-}
-
-SectionUseCase."Voice_Call" {
- File "VoiceCall.conf"
- Comment "Capture and Playback in Voice quality"
-}
-
-SectionUseCase."Voice_Call_IP" {
- File "VoiceCall.conf"
- Comment "Capture and Playback in Voice quality"
-}
-
-SectionUseCase."FM_Analog_Radio" {
- File "FMAnalog.conf"
- Comment "Capture FM Analog Radio"
-}
diff --git a/ucm2/SDP4430/Voice.conf b/ucm2/SDP4430/Voice.conf
deleted file mode 100644
index 57f45549d31f..000000000000
--- a/ucm2/SDP4430/Voice.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# Use case Configuration for TI SDP4430 HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='DL1 Mixer Voice' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Voice Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
- ]
-
- DisableSequence [
- cset "name='DL1 Mixer Voice' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Voice Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
- ]
-
- Value {
- TQ "Voice"
- }
-}
-
-SectionDevice."Headset" {
- Comment "SDP4430 3.5mm Headset"
-
- EnableSequence [
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId},2"
- }
-}
diff --git a/ucm2/SDP4430/VoiceCall.conf b/ucm2/SDP4430/VoiceCall.conf
deleted file mode 100644
index adf62ea25aa7..000000000000
--- a/ucm2/SDP4430/VoiceCall.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# Use case Configuration for TI SDP4430 HiFi Music
-# By Liam Girdwood <lrg@slimlogic.co.uk>
-
-SectionVerb {
- EnableSequence [
- cset "name='AMIC_UL PDM Switch' 1"
- cset "name='Sidetone Mixer Capture' 1"
- cset "name='MUX_VX0' 9"
- cset "name='MUX_VX1' 10"
- cset "name='DL1 Mixer Voice' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Voice Playback Volume' 90,90"
- cset "name='Capture Volume' 4"
- cset "name='Capture Mixer Voice Capture' 90,90"
- cset "name='SDT DL Volume' 120"
- ]
-
-
- DisableSequence [
- cset "name='AMIC_UL PDM Switch' 0"
- cset "name='Sidetone Mixer Capture' 0"
- cset "name='MUX_VX0' 0"
- cset "name='MUX_VX1' 0"
- cset "name='DL1 Mixer Voice' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Voice Playback Volume' 0,0"
- cset "name='Capture Volume' 0"
- cset "name='DL1 Voice Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
- ]
-
- Value {
- TQ "Voice"
- }
-}
-
-SectionDevice."Headset" {
- Comment "SDP4430 3.5mm Headset"
-
- EnableSequence [
- cset "name='Analog Left Capture Route' 0"
- cset "name='Analog Right Capture Route' 0"
- cset "name='Capture Preamplifier Volume' 2"
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
- ]
-
- DisableSequence [
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
- ]
-
- Value {
- CapturePriority 100
- CapturePCM "hw:${CardId},2"
- PlaybackPriority 100
- PlaybackPCM "hw:${CardId},2"
- }
-}
--
2.16.4
Reference in New Issue View Git Blame Copy Permalink