conf/ucm: bytcr-rt5651: Add bytcr-rt5651-mono-spk-in2-mic-hp-swapped config

Add a longname profile for devices with a mono speaker, the Internal Mic
hooked up to IN2 and the left and right channels of their headphones
output swapped.

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
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 9fb7218cbd865bfd7bfc3cdb4dad09f3c333dd89..97d61abd11001ce97a65ad4a4bada9a6cc4060c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -731,6 +731,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
          src/conf/ucm/bytcr-rt5651/Makefile \
          src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/Makefile \
          src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/Makefile \
+         src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/Makefile \
          src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/Makefile \
          src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/Makefile \
          src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/Makefile \

diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index 1246e7ae83fab0417bb3aaf3be8bbf9a10e30673..7cdc6176584a1bd0750897e7cb62df00f0ba21f2 100644 (file)
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -13,6 +13,7 @@ bytcr-rt5640-stereo-spk-in3-mic \
 bytcr-rt5651 \
 bytcr-rt5651-mono-spk-in1-mic \
 bytcr-rt5651-mono-spk-in2-mic \
+bytcr-rt5651-mono-spk-in2-mic-hp-swapped \
 bytcr-rt5651-stereo-spk-in1-mic \
 bytcr-rt5651-stereo-spk-in2-mic \
 bytcr-rt5651-stereo-spk-in12-mic \

diff --git a/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
new file mode 100644 (file)
index 0000000..777ed78
--- /dev/null
+++ b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
@@ -0,0 +1,27 @@
+# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
+
+<searchdir:ucm>
+
+SectionVerb {
+       EnableSequence [
+               cdev "hw:bytcrrt5651"
+               <bytcr/PlatformEnableSeq.conf>
+               <rt5651/EnableSeq.conf>
+       ]
+
+       DisableSequence [
+               cdev "hw:bytcrrt5651"
+               <bytcr/PlatformDisableSeq.conf>
+       ]
+
+       Value {
+               PlaybackPCM "hw:bytcrrt5651"
+               CapturePCM "hw:bytcrrt5651"
+       }
+}
+
+<rt5651/MonoSpeaker.conf>
+<rt5651/HeadPhones-swapped.conf>
+
+<rt5651/IN2-InternalMic.conf>
+<rt5651/IN3-HeadsetMic.conf>

diff --git a/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/Makefile.am b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/Makefile.am
new file mode 100644 (file)
index 0000000..862d38b
--- /dev/null
+++ b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped
+ucm_DATA = bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf HiFi.conf
+EXTRA_DIST = $(ucm_DATA)

diff --git a/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf
new file mode 100644 (file)
index 0000000..916fbc1
--- /dev/null
+++ b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf
@@ -0,0 +1,10 @@
+# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
+
+SectionUseCase."HiFi" {
+       File "../bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf"
+       Comment "Play HiFi quality Music"
+}
+
+SectionDefaults [
+       cdev "hw:bytcrrt5651"
+]

diff --git a/src/conf/ucm/rt5651/HeadPhones-swapped.conf b/src/conf/ucm/rt5651/HeadPhones-swapped.conf
new file mode 100644 (file)
index 0000000..e79b40a
--- /dev/null
+++ b/src/conf/ucm/rt5651/HeadPhones-swapped.conf
@@ -0,0 +1,42 @@
+SectionDevice."Headphones" {
+       Comment "Headphones"
+
+       ConflictingDevice [
+               "Speaker"
+               "MonoSpeaker"
+       ]
+
+       EnableSequence [
+               cdev "hw:bytcrrt5651"
+
+               # Swap left and right
+               cset "name='Stereo DAC MIXL DAC R1 Switch' on"
+               cset "name='Stereo DAC MIXL DAC L1 Switch' off"
+               cset "name='Stereo DAC MIXR DAC L1 Switch' on"
+               cset "name='Stereo DAC MIXR DAC R1 Switch' off"
+
+               cset "name='Headphone Switch' on"
+               cset "name='HPO L Playback Switch' on"
+               cset "name='HPO R Playback Switch' on"
+               # Done after turning the HP on to keep the bias and clk on
+               cset "name='Speaker Switch' off"
+               cset "name='LOUT L Playback Switch' off"
+               cset "name='LOUT R Playback Switch' off"
+       ]
+
+       DisableSequence [
+               cdev "hw:bytcrrt5651"
+               # Disabling the HP switches is done by the Speaker EnableSeq
+
+               # Unswap left and right
+               cset "name='Stereo DAC MIXL DAC L1 Switch' on"
+               cset "name='Stereo DAC MIXL DAC R1 Switch' off"
+               cset "name='Stereo DAC MIXR DAC R1 Switch' on"
+               cset "name='Stereo DAC MIXR DAC L1 Switch' off"
+       ]
+
+       Value {
+               PlaybackChannels "2"
+               JackControl "Headphone Jack"
+       }
+}

diff --git a/src/conf/ucm/rt5651/Makefile.am b/src/conf/ucm/rt5651/Makefile.am
index a9600ed6dce945e51a78bb230c4375b3bd86b799..acc8ea491043c159db40824dd167a922ed8502d7 100644 (file)
--- a/src/conf/ucm/rt5651/Makefile.am
+++ b/src/conf/ucm/rt5651/Makefile.am
@@ -1,6 +1,6 @@
 alsaconfigdir = @ALSA_CONFIG_DIR@
 ucmdir = $(alsaconfigdir)/ucm/rt5651
-ucm_DATA = EnableSeq.conf HeadPhones.conf IN1-InternalMic.conf \
-          IN2-InternalMic.conf IN12-InternalMic.conf IN3-HeadsetMic.conf \
-          Speaker.conf MonoSpeaker.conf
+ucm_DATA = EnableSeq.conf HeadPhones.conf HeadPhones-swapped.conf \
+          IN1-InternalMic.conf IN2-InternalMic.conf IN12-InternalMic.conf \
+          IN3-HeadsetMic.conf Speaker.conf MonoSpeaker.conf
 EXTRA_DIST = $(ucm_DATA)