conf/ucm: chtnau8824: Add UCM profile for chtnau8824 boards

Add UCM profile for chtnau8824 boards based on:
https://github.com/plbossart/UCM/blob/master/chtnau8824

Split into multiple files in the same way as this was done for the
bytcr-rt5640 support, re-using the existing ucm/PlatformEnableSeq.conf
and ucm/PlatformDisableSeq.conf files for the SST mixer settings.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/configure.ac b/configure.ac
index 57e0c354060e81edd08e08c9171e47d7647ec5c3..ce21c7fb38a6dbc6e4333e35eb93d79d71e2b050 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -729,6 +729,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
          src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/Makefile \
          src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/Makefile \
          src/conf/ucm/bytcr-rt5651/Makefile \
+         src/conf/ucm/chtnau8824/Makefile \
          src/conf/ucm/chtrt5645/Makefile \
          src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile \
          src/conf/ucm/DAISY-I2S/Makefile \
@@ -739,6 +740,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
          src/conf/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/Makefile \
          src/conf/ucm/HDAudio-Lenovo-DualCodecs/Makefile \
          src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/Makefile \
+         src/conf/ucm/nau8824/Makefile \
          src/conf/ucm/PandaBoard/Makefile \
          src/conf/ucm/PandaBoardES/Makefile \
          src/conf/ucm/PAZ00/Makefile \

diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index a524921b5cf098bfd0c6899a2ae0ab5b592a318c..c350c526ebb1036030720c33c3820427429d37e9 100644 (file)
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -11,6 +11,7 @@ bytcr-rt5640-stereo-spk-dmic1-mic \
 bytcr-rt5640-stereo-spk-in1-mic \
 bytcr-rt5640-stereo-spk-in3-mic \
 bytcr-rt5651 \
+chtnau8824 \
 chtrt5645 \
 chtrt5645-mono-speaker-analog-mic \
 DAISY-I2S \
@@ -21,6 +22,7 @@ gpd-win-pocket-rt5645 \
 HDAudio-Gigabyte-ALC1220DualCodecs \
 HDAudio-Lenovo-DualCodecs \
 LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216 \
+nau8824 \
 PandaBoard \
 PandaBoardES \
 PAZ00 \

diff --git a/src/conf/ucm/chtnau8824/HiFi.conf b/src/conf/ucm/chtnau8824/HiFi.conf
new file mode 100644 (file)
index 0000000..dc52800
--- /dev/null
+++ b/src/conf/ucm/chtnau8824/HiFi.conf
@@ -0,0 +1,28 @@
+<searchdir:ucm>
+
+SectionVerb {
+
+       Value {
+               TQ "HiFi"
+               # ALSA PCM device for HiFi
+               PlaybackPCM "hw:chtnau8824"
+               CapturePCM "hw:chtnau8824"
+       }
+
+       EnableSequence [
+               cdev "hw:chtnau8824"
+               <bytcr/PlatformEnableSeq.conf>
+               <nau8824/EnableSeq.conf>
+       ]
+
+       DisableSequence [
+               cdev "hw:chtnau8824"
+               <bytcr/PlatformDisableSeq.conf>
+       ]
+}
+
+<nau8824/Speaker.conf>
+<nau8824/HeadPhones.conf>
+
+<nau8824/InternalMic.conf>
+<nau8824/HeadsetMic.conf>

diff --git a/src/conf/ucm/chtnau8824/Makefile.am b/src/conf/ucm/chtnau8824/Makefile.am
new file mode 100644 (file)
index 0000000..e197d3e
--- /dev/null
+++ b/src/conf/ucm/chtnau8824/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/chtnau8824
+ucm_DATA = chtnau8824.conf HiFi.conf
+EXTRA_DIST = $(ucm_DATA)

diff --git a/src/conf/ucm/chtnau8824/chtnau8824.conf b/src/conf/ucm/chtnau8824/chtnau8824.conf
new file mode 100644 (file)
index 0000000..189b0db
--- /dev/null
+++ b/src/conf/ucm/chtnau8824/chtnau8824.conf
@@ -0,0 +1,6 @@
+Comment "chtnau8824 internal card"
+
+SectionUseCase."HiFi" {
+       File "HiFi.conf"
+       Comment "Default"
+}

diff --git a/src/conf/ucm/nau8824/EnableSeq.conf b/src/conf/ucm/nau8824/EnableSeq.conf
new file mode 100644 (file)
index 0000000..05f5f0b
--- /dev/null
+++ b/src/conf/ucm/nau8824/EnableSeq.conf
@@ -0,0 +1,15 @@
+# Playback TDM configuration
+cset "name='DACL Channel Source' 0"
+cset "name='DACR Channel Source' 1"
+# Input Configuration
+cset "name='DMIC1 Enable Switch' off"
+cset "name='DMIC2 Enable Switch' off"
+cset "name='DMIC3 Enable Switch' off"
+cset "name='DMIC4 Enable Switch' off"
+cset "name='MIC1 Volume' 10"
+cset "name='MIC2 Volume' 10"
+# Button Configuration
+cset "name='THD for key media' 10"
+cset "name='THD for key voice command' 16"
+cset "name='THD for key volume up' 38"
+cset "name='THD for key volume down' 115"

diff --git a/src/conf/ucm/nau8824/HeadPhones.conf b/src/conf/ucm/nau8824/HeadPhones.conf
new file mode 100644 (file)
index 0000000..8ed6f19
--- /dev/null
+++ b/src/conf/ucm/nau8824/HeadPhones.conf
@@ -0,0 +1,25 @@
+SectionDevice."Headphones" {
+       Comment "Headphones"
+
+       Value {
+               PlaybackChannels "2"
+               JackControl "Headphone Jack"
+       }
+
+       ConflictingDevice [
+               "MonoSpeaker"
+               "Speaker"
+       ]
+
+       EnableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='Headphone Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='Headphone Switch' off"
+       ]
+}

diff --git a/src/conf/ucm/nau8824/HeadsetMic.conf b/src/conf/ucm/nau8824/HeadsetMic.conf
new file mode 100644 (file)
index 0000000..11b0b52
--- /dev/null
+++ b/src/conf/ucm/nau8824/HeadsetMic.conf
@@ -0,0 +1,31 @@
+SectionDevice."HeadsetMic" {
+       Comment "Headset Microphone"
+
+       Value {
+               CaptureChannels "2"
+               JackControl "Headset Mic Jack"
+       }
+
+       ConflictingDevice [
+               "InternalMic"
+       ]
+
+       EnableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='ADC CH0 Select' 1"
+               cset "name='ADC CH1 Select' 1"
+
+               cset "name='Headset Mic Switch' on"
+               cset "name='Right ADC HSMIC Switch' on"
+               cset "name='Left ADC HSMIC Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='Headset Mic Switch' off"
+               cset "name='Right ADC HSMIC Switch' off"
+               cset "name='Left ADC HSMIC Switch' off"
+       ]
+}

diff --git a/src/conf/ucm/nau8824/InternalMic.conf b/src/conf/ucm/nau8824/InternalMic.conf
new file mode 100644 (file)
index 0000000..c6a741c
--- /dev/null
+++ b/src/conf/ucm/nau8824/InternalMic.conf
@@ -0,0 +1,31 @@
+SectionDevice."InternalMic" {
+       Comment "Internal Microphone"
+
+       Value {
+               CaptureChannels "2"
+               CapturePriority "150"
+       }
+
+       ConflictingDevice [
+               "HeadsetMic"
+       ]
+
+       EnableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='ADC CH0 Select' 0"
+               cset "name='ADC CH1 Select' 0"
+
+               cset "name='Int Mic Switch' on"
+               cset "name='Right ADC MIC Switch' on"
+               cset "name='Left ADC MIC Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='Int Mic Switch' off"
+               cset "name='Right ADC MIC Switch' off"
+               cset "name='Left ADC MIC Switch' off"
+       ]
+}

diff --git a/src/conf/ucm/nau8824/Makefile.am b/src/conf/ucm/nau8824/Makefile.am
new file mode 100644 (file)
index 0000000..b39b8bb
--- /dev/null
+++ b/src/conf/ucm/nau8824/Makefile.am
@@ -0,0 +1,5 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/nau8824
+ucm_DATA = EnableSeq.conf HeadPhones.conf HeadsetMic.conf InternalMic.conf \
+          MonoSpeaker.conf Speaker.conf
+EXTRA_DIST = $(ucm_DATA)

diff --git a/src/conf/ucm/nau8824/MonoSpeaker.conf b/src/conf/ucm/nau8824/MonoSpeaker.conf
new file mode 100644 (file)
index 0000000..8673518
--- /dev/null
+++ b/src/conf/ucm/nau8824/MonoSpeaker.conf
@@ -0,0 +1,29 @@
+SectionDevice."MonoSpeaker" {
+       Comment "Mono Speaker"
+
+       Value {
+               PlaybackChannels "2"
+       }
+
+       ConflictingDevice [
+               "Speaker"
+               "Headphones"
+       ]
+
+       EnableSequence [
+               cdev "hw:chtnau8824"
+
+               # nau8824 mono speaker boards have the speaker on the right chan
+               cset "name='Speaker Left DACL Volume' 0"
+               cset "name='Speaker Left DACR Volume' 0"
+               cset "name='Speaker Right DACL Volume' 1"
+               cset "name='Speaker Right DACR Volume' 1"
+               cset "name='Ext Spk Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='Ext Spk Switch' off"
+       ]
+}

diff --git a/src/conf/ucm/nau8824/Speaker.conf b/src/conf/ucm/nau8824/Speaker.conf
new file mode 100644 (file)
index 0000000..e4d25b0
--- /dev/null
+++ b/src/conf/ucm/nau8824/Speaker.conf
@@ -0,0 +1,28 @@
+SectionDevice."Speaker" {
+       Comment "Speaker"
+
+       Value {
+               PlaybackChannels "2"
+       }
+
+       ConflictingDevice [
+               "MonoSpeaker"
+               "Headphones"
+       ]
+
+       EnableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='Speaker Left DACL Volume' 1"
+               cset "name='Speaker Left DACR Volume' 0"
+               cset "name='Speaker Right DACL Volume' 0"
+               cset "name='Speaker Right DACR Volume' 1"
+               cset "name='Ext Spk Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:chtnau8824"
+
+               cset "name='Ext Spk Switch' off"
+       ]
+}