May 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] conf/ucm: bytcr-rt5640: Add generic bytcr-rt5640 UCM profile
by Hans de Goede 19 May '18

19 May '18

This commit adds the generic UCM profile for bytcr-rt5640 boards from: https://github.com/plbossart/UCM, plus the fixes from this pull-req: https://github.com/plbossart/UCM/pull/31 The profile has been split up into separate per input / output files to allow for creation of long-name profiles with the specific input / output combinations found on a board without needing to copy and paste things. Note this profile exports all inputs and both stereo/mono speaker setups even though a typical device will not use all. Ideally a long-name based device specific profile made up of the various parts should be used instead. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- configure.ac | 3 + src/conf/ucm/Makefile.am | 3 + src/conf/ucm/bytcr-rt5640/HiFi.conf | 29 +++++ src/conf/ucm/bytcr-rt5640/Makefile.am | 4 + src/conf/ucm/bytcr-rt5640/bytcr-rt5640.conf | 8 ++ src/conf/ucm/bytcr/Makefile.am | 4 + src/conf/ucm/bytcr/PlatformEnableSeq.conf | 115 ++++++++++++++++++++ src/conf/ucm/rt5640/DigitalMics.conf | 31 ++++++ src/conf/ucm/rt5640/EnableSeq.conf | 41 +++++++ src/conf/ucm/rt5640/HeadPhones.conf | 41 +++++++ src/conf/ucm/rt5640/HeadsetMic.conf | 48 ++++++++ src/conf/ucm/rt5640/IN1-InternalMic.conf | 50 +++++++++ src/conf/ucm/rt5640/IN3-InternalMic.conf | 50 +++++++++ src/conf/ucm/rt5640/Makefile.am | 5 + src/conf/ucm/rt5640/MonoSpeaker.conf | 45 ++++++++ src/conf/ucm/rt5640/Speaker.conf | 45 ++++++++ 16 files changed, 522 insertions(+) create mode 100644 src/conf/ucm/bytcr-rt5640/HiFi.conf create mode 100644 src/conf/ucm/bytcr-rt5640/Makefile.am create mode 100644 src/conf/ucm/bytcr-rt5640/bytcr-rt5640.conf create mode 100644 src/conf/ucm/bytcr/Makefile.am create mode 100644 src/conf/ucm/bytcr/PlatformEnableSeq.conf create mode 100644 src/conf/ucm/rt5640/DigitalMics.conf create mode 100644 src/conf/ucm/rt5640/EnableSeq.conf create mode 100644 src/conf/ucm/rt5640/HeadPhones.conf create mode 100644 src/conf/ucm/rt5640/HeadsetMic.conf create mode 100644 src/conf/ucm/rt5640/IN1-InternalMic.conf create mode 100644 src/conf/ucm/rt5640/IN3-InternalMic.conf create mode 100644 src/conf/ucm/rt5640/Makefile.am create mode 100644 src/conf/ucm/rt5640/MonoSpeaker.conf create mode 100644 src/conf/ucm/rt5640/Speaker.conf diff --git a/configure.ac b/configure.ac index 693b5d53..f6ee6ca8 100644 --- a/configure.ac +++ b/configure.ac @@ -720,6 +720,8 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/Makefile \ src/conf/ucm/broadwell-rt286/Makefile \ src/conf/ucm/broxton-rt298/Makefile \ + src/conf/ucm/bytcr/Makefile \ + src/conf/ucm/bytcr-rt5640/Makefile \ src/conf/ucm/bytcr-rt5651/Makefile \ src/conf/ucm/chtrt5645/Makefile \ src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile \ @@ -734,6 +736,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/PandaBoard/Makefile \ src/conf/ucm/PandaBoardES/Makefile \ src/conf/ucm/PAZ00/Makefile \ + src/conf/ucm/rt5640/Makefile \ src/conf/ucm/SDP4430/Makefile \ src/conf/ucm/skylake-rt286/Makefile \ src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 38fc6b25..dc2d6857 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS=\ ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN \ broadwell-rt286 \ broxton-rt298 \ +bytcr \ +bytcr-rt5640 \ bytcr-rt5651 \ chtrt5645 \ chtrt5645-mono-speaker-analog-mic \ @@ -16,6 +18,7 @@ LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216 \ PandaBoard \ PandaBoardES \ PAZ00 \ +rt5640 \ SDP4430 \ skylake-rt286 \ TECLAST-X80Pro-Defaultstring-CherryTrailCR \ diff --git a/src/conf/ucm/bytcr-rt5640/HiFi.conf b/src/conf/ucm/bytcr-rt5640/HiFi.conf new file mode 100644 index 00000000..130671ca --- /dev/null +++ b/src/conf/ucm/bytcr-rt5640/HiFi.conf @@ -0,0 +1,29 @@ +# Use case Configuration for bytcr-rt5640 + +<searchdir:ucm> + +SectionVerb { + EnableSequence [ + cdev "hw:bytcrrt5640" + + <bytcr/PlatformEnableSeq.conf> + <rt5640/EnableSeq.conf> + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:bytcrrt5640" + CapturePCM "hw:bytcrrt5640" + } +} + +<rt5640/Speaker.conf> +<rt5640/MonoSpeaker.conf> +<rt5640/HeadPhones.conf> + +<rt5640/DigitalMics.conf> +<rt5640/IN1-InternalMic.conf> +<rt5640/IN3-InternalMic.conf> +<rt5640/HeadsetMic.conf> diff --git a/src/conf/ucm/bytcr-rt5640/Makefile.am b/src/conf/ucm/bytcr-rt5640/Makefile.am new file mode 100644 index 00000000..84ddf7b1 --- /dev/null +++ b/src/conf/ucm/bytcr-rt5640/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5640 +ucm_DATA = bytcr-rt5640.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcr-rt5640/bytcr-rt5640.conf b/src/conf/ucm/bytcr-rt5640/bytcr-rt5640.conf new file mode 100644 index 00000000..676b4fd9 --- /dev/null +++ b/src/conf/ucm/bytcr-rt5640/bytcr-rt5640.conf @@ -0,0 +1,8 @@ +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cdev "hw:bytcrrt5640" +] diff --git a/src/conf/ucm/bytcr/Makefile.am b/src/conf/ucm/bytcr/Makefile.am new file mode 100644 index 00000000..a0e5545e --- /dev/null +++ b/src/conf/ucm/bytcr/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/bytcr +ucm_DATA = PlatformEnableSeq.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcr/PlatformEnableSeq.conf b/src/conf/ucm/bytcr/PlatformEnableSeq.conf new file mode 100644 index 00000000..b5ee2b41 --- /dev/null +++ b/src/conf/ucm/bytcr/PlatformEnableSeq.conf @@ -0,0 +1,115 @@ +# media mixer settings +# compress +cset "name='media0_in Gain 0 Switch' on" +cset "name='media0_in Gain 0 Volume' 0" + +# normal +cset "name='media1_in Gain 0 Switch' on" +cset "name='media1_in Gain 0 Volume' 0" +# swm loopback +cset "name='media2_in Gain 0 Switch' off" +cset "name='media2_in Gain 0 Volume' 0%" +# deep buffer +cset "name='media3_in Gain 0 Switch' on" +cset "name='media3_in Gain 0 Volume' 0" + +cset "name='media0_out mix 0 media0_in Switch' on" +cset "name='media0_out mix 0 media1_in Switch' on" +cset "name='media0_out mix 0 media2_in Switch' off" +cset "name='media0_out mix 0 media3_in Switch' on" + +cset "name='media1_out mix 0 media0_in Switch' off" +cset "name='media1_out mix 0 media1_in Switch' off" +cset "name='media1_out mix 0 media2_in Switch' off" +cset "name='media1_out mix 0 media3_in Switch' off" + +cset "name='pcm0_in Gain 0 Switch' on" +cset "name='pcm0_in Gain 0 Volume' 0" + +cset "name='pcm1_in Gain 0 Switch' off" +cset "name='pcm1_in Gain 0 Volume' 0%" + +# codec0_out settings (used if SSP2 is connected) +cset "name='codec_out0 mix 0 codec_in0 Switch' off" +cset "name='codec_out0 mix 0 codec_in1 Switch' off" +cset "name='codec_out0 mix 0 media_loop1_in Switch' off" +cset "name='codec_out0 mix 0 media_loop2_in Switch' off" +cset "name='codec_out0 mix 0 pcm0_in Switch' on" +cset "name='codec_out0 mix 0 pcm1_in Switch' off" +cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" +cset "name='codec_out0 Gain 0 Switch' on" +cset "name='codec_out0 Gain 0 Volume' 0" + +# modem_out settings (used if SSP0 is connected) +cset "name='modem_out mix 0 codec_in0 Switch' off" +cset "name='modem_out mix 0 codec_in1 Switch' off" +cset "name='modem_out mix 0 media_loop1_in Switch' off" +cset "name='modem_out mix 0 media_loop2_in Switch' off" +cset "name='modem_out mix 0 pcm0_in Switch' on" +cset "name='modem_out mix 0 pcm1_in Switch' off" +cset "name='modem_out mix 0 sprot_loop_in Switch' off" +cset "name='modem_out Gain 0 Switch' on" +cset "name='modem_out Gain 0 Volume' 0" + +# input settings + +# input used when SSP2 is connected +cset "name='codec_in0 Gain 0 Switch' on" +cset "name='codec_in0 Gain 0 Volume' 0" + +# input used when SSP0 is connected +cset "name='modem_in Gain 0 Switch' on" +cset "name='modem_in Gain 0 Volume' 0" + +# pcm1_out settings +cset "name='pcm1_out mix 0 codec_in0 Switch' on" +cset "name='pcm1_out mix 0 modem_in Switch' on" +cset "name='pcm1_out mix 0 codec_in1 Switch' off" +cset "name='pcm1_out mix 0 media_loop1_in Switch' off" +cset "name='pcm1_out mix 0 media_loop2_in Switch' off" +cset "name='pcm1_out mix 0 pcm0_in Switch' off" +cset "name='pcm1_out mix 0 pcm1_in Switch' off" +cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" + +cset "name='pcm1_out Gain 0 Switch' on" +cset "name='pcm1_out Gain 0 Volume' 0" + +# disable codec_out1 +cset "name='codec_out1 mix 0 codec_in0 Switch' off" +cset "name='codec_out1 mix 0 codec_in1 Switch' off" +cset "name='codec_out1 mix 0 media_loop1_in Switch' off" +cset "name='codec_out1 mix 0 media_loop2_in Switch' off" +cset "name='codec_out1 mix 0 pcm0_in Switch' off" +cset "name='codec_out1 mix 0 pcm1_in Switch' off" +cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" +cset "name='codec_out1 Gain 0 Switch' off" +cset "name='codec_out1 Gain 0 Volume' 0%" + +# disable codec_in1 +cset "name='codec_in1 Gain 0 Switch' off" +cset "name='codec_in1 Gain 0 Volume' 0%" + +# disable all loops +cset "name='media_loop1_out mix 0 codec_in0 Switch' off" +cset "name='media_loop1_out mix 0 codec_in1 Switch' off" +cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" +cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" +cset "name='media_loop1_out mix 0 pcm0_in Switch' off" +cset "name='media_loop1_out mix 0 pcm1_in Switch' off" +cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" + +cset "name='media_loop2_out mix 0 codec_in0 Switch' off" +cset "name='media_loop2_out mix 0 codec_in1 Switch' off" +cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" +cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" +cset "name='media_loop2_out mix 0 pcm0_in Switch' off" +cset "name='media_loop2_out mix 0 pcm1_in Switch' off" +cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" + +cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" +cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" +cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" +cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" +cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" +cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" +cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" diff --git a/src/conf/ucm/rt5640/DigitalMics.conf b/src/conf/ucm/rt5640/DigitalMics.conf new file mode 100644 index 00000000..c7d54099 --- /dev/null +++ b/src/conf/ucm/rt5640/DigitalMics.conf @@ -0,0 +1,31 @@ +SectionDevice."DigitalMics" { + Comment "DigitalMics capture" + + ConflictingDevice [ + "IN1-InternalMics" + "IN3-InternalMics" + "HeadsetMic" + ] + + EnableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Stereo ADC MIXL ADC2 Switch' on" + cset "name='Stereo ADC MIXR ADC2 Switch' on" + cset "name='Internal Mic Switch' on" + + ] + + DisableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Stereo ADC MIXL ADC2 Switch' off" + cset "name='Stereo ADC MIXR ADC2 Switch' off" + cset "name='Internal Mic Switch' off" + + ] + + Value { + CaptureChannels 2 + } +} diff --git a/src/conf/ucm/rt5640/EnableSeq.conf b/src/conf/ucm/rt5640/EnableSeq.conf new file mode 100644 index 00000000..62795fa6 --- /dev/null +++ b/src/conf/ucm/rt5640/EnableSeq.conf @@ -0,0 +1,41 @@ +# RT5640 default output routing +cset "name='OUT MIXL DAC L1 Switch' on" +cset "name='OUT MIXR DAC R1 Switch' on" + +# uncomment for loopback mic->speakers +# cset "name='SPOL MIX BST1 Switch' on" +# cset "name='SPOR MIX BST1 Switch' on" + +# uncomment for loopback playback -> capture +# cset "name='RECMIXL OUT MIXL Switch' on" +# cset "name='RECMIXR OUT MIXR Switch' on" + +# uncomment to enable swap between AIF1 and AIF2 +# warning: can only work with SSP0 firmware enabled +cset "name='SDI select' 0" +cset "name='DAI select' 0" +#cset "name='SDI select' 1" +#cset "name='DAI select' 1" + +cset "name='DAC2 Playback Switch' on" +cset "name='DIG MIXL DAC L2 Switch' on" + +# Input Configuration +cset "name='Stereo ADC1 Mux' ADC" +cset "name='Stereo ADC2 Mux' DMIC1" +cset "name='Mono ADC L1 Mux' 1" +cset "name='Mono ADC R1 Mux' 1" + +# 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics +cset "name='ADC Capture Volume' 63" +# Set ADC Boost Gain to 3dB higher vals result in too much noise +cset "name='ADC Boost Gain' 1" +# Set IN1/IN3 internal mic boost to 8 (max) +# Set IN2 headset-mic boost to 1, headset mics are quite loud +cset "name='IN1 Boost' 8" +cset "name='IN2 Boost' 1" +cset "name='IN3 Boost' 8" + +cset "name='Internal Mic Switch' off" +cset "name='Headset Mic Switch' off" +cset "name='ADC Capture Switch' on" diff --git a/src/conf/ucm/rt5640/HeadPhones.conf b/src/conf/ucm/rt5640/HeadPhones.conf new file mode 100644 index 00000000..7d5948b4 --- /dev/null +++ b/src/conf/ucm/rt5640/HeadPhones.conf @@ -0,0 +1,41 @@ +SectionDevice."Headphones" { + Comment "Headphones playback" + + ConflictingDevice [ + "Speaker" + "MonoSpeaker" + ] + + EnableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='DAC MIXL INF1 Switch' on" + cset "name='DAC MIXR INF1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + set "name='Stereo DAC MIXL DAC L2 Switch' on" + cset "name='Stereo DAC MIXR DAC R2 Switch' on" + cset "name='HPO MIX HPVOL Switch' on" + cset "name='Headphone Switch' on" + cset "name='HP Channel Switch' on" + cset "name='Speaker Switch' off" + cset "name='HP L Playback Switch' on" + cset "name='HP R Playback Switch' on" + cset "name='HP Playback Volume' 29" + + ] + + DisableSequence [ + cdev "hw:bytcrrt5640" + cset "name='Headphone Switch' off" + cset "name='HP Channel Switch' off" + cset "name='HP L Playback Switch' off" + cset "name='HP R Playback Switch' off" + cset "name='HP Playback Volume' 0" + ] + + Value { + PlaybackChannels "2" + JackControl "Headphone Jack" + } +} diff --git a/src/conf/ucm/rt5640/HeadsetMic.conf b/src/conf/ucm/rt5640/HeadsetMic.conf new file mode 100644 index 00000000..4d54eed0 --- /dev/null +++ b/src/conf/ucm/rt5640/HeadsetMic.conf @@ -0,0 +1,48 @@ +SectionDevice."HeadsetMic" { + Comment "Headset Mic capture" + + ConflictingDevice [ + "IN1-InternalMics" + "IN3-InternalMics" + "DigitalMics" + ] + + EnableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Headset Mic Switch' on" + + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' on" + + cset "name='Stereo ADC MIXL ADC1 Switch' on" + cset "name='Stereo ADC MIXR ADC1 Switch' on" + + cset "name='Mono ADC MIXL ADC1 Switch' on" + cset "name='Mono ADC MIXR ADC1 Switch' on" + + cset "name='Mono ADC Capture Switch' on" + ] + + DisableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Stereo ADC MIXL ADC1 Switch' off" + cset "name='Stereo ADC MIXR ADC1 Switch' off" + + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" + + cset "name='Headset Mic Switch' off" + + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + + cset "name='Mono ADC Capture Switch' off" + ] + + Value { + CaptureChannels 2 + JackControl "Headset Mic Jack" + } +} diff --git a/src/conf/ucm/rt5640/IN1-InternalMic.conf b/src/conf/ucm/rt5640/IN1-InternalMic.conf new file mode 100644 index 00000000..d18c21db --- /dev/null +++ b/src/conf/ucm/rt5640/IN1-InternalMic.conf @@ -0,0 +1,50 @@ +SectionDevice."IN1-InternalMics" { + Comment "Internal IN1 analog Mic capture" + + ConflictingDevice [ + "DigitalMics" + "HeadsetMic" + "IN3-InternalMics" + ] + + EnableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Internal Mic Switch' on" + + cset "name='RECMIXL BST1 Switch' on" + cset "name='RECMIXR BST1 Switch' on" + cset "name='RECMIXL BST3 Switch' off" + cset "name='RECMIXR BST3 Switch' off" + + cset "name='Stereo ADC MIXL ADC1 Switch' on" + cset "name='Stereo ADC MIXR ADC1 Switch' on" + + cset "name='Mono ADC MIXL ADC1 Switch' on" + cset "name='Mono ADC MIXR ADC1 Switch' on" + + cset "name='Mono ADC Capture Switch' on" + ] + + DisableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Stereo ADC MIXL ADC1 Switch' off" + cset "name='Stereo ADC MIXR ADC1 Switch' off" + + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + + cset "name='Internal Mic Switch' off" + + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + + cset "name='Mono ADC Capture Switch' off" + + ] + + Value { + CaptureChannels 2 + } +} diff --git a/src/conf/ucm/rt5640/IN3-InternalMic.conf b/src/conf/ucm/rt5640/IN3-InternalMic.conf new file mode 100644 index 00000000..17d85229 --- /dev/null +++ b/src/conf/ucm/rt5640/IN3-InternalMic.conf @@ -0,0 +1,50 @@ +SectionDevice."IN3-InternalMics" { + Comment "Internal IN3 analog Mic capture" + + ConflictingDevice [ + "DigitalMics" + "HeadsetMic" + "IN1-InternalMics" + ] + + EnableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Internal Mic Switch' on" + + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='RECMIXL BST3 Switch' on" + cset "name='RECMIXR BST3 Switch' on" + + cset "name='Stereo ADC MIXL ADC1 Switch' on" + cset "name='Stereo ADC MIXR ADC1 Switch' on" + + cset "name='Mono ADC MIXL ADC1 Switch' on" + cset "name='Mono ADC MIXR ADC1 Switch' on" + + cset "name='Mono ADC Capture Switch' on" + + ] + + DisableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='Stereo ADC MIXL ADC1 Switch' off" + cset "name='Stereo ADC MIXR ADC1 Switch' off" + + cset "name='RECMIXL BST3 Switch' off" + cset "name='RECMIXR BST3 Switch' off" + + cset "name='Internal Mic Switch' off" + + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + + cset "name='Mono ADC Capture Switch' off" + ] + + Value { + CaptureChannels 2 + } +} diff --git a/src/conf/ucm/rt5640/Makefile.am b/src/conf/ucm/rt5640/Makefile.am new file mode 100644 index 00000000..a6fbdc57 --- /dev/null +++ b/src/conf/ucm/rt5640/Makefile.am @@ -0,0 +1,5 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/rt5640 +ucm_DATA = DigitalMics.conf EnableSeq.conf HeadPhones.conf HeadsetMic.conf \ + IN1-InternalMic.conf IN3-InternalMic.conf MonoSpeaker.conf Speaker.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/rt5640/MonoSpeaker.conf b/src/conf/ucm/rt5640/MonoSpeaker.conf new file mode 100644 index 00000000..0fb54030 --- /dev/null +++ b/src/conf/ucm/rt5640/MonoSpeaker.conf @@ -0,0 +1,45 @@ +SectionDevice."MonoSpeaker" { + Comment "MonoSpeaker playback" + + ConflictingDevice [ + "Headphones" + "Speaker" + ] + + EnableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='DAC MIXL INF1 Switch' on" + cset "name='DAC MIXR INF1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXL DAC L2 Switch' on" + cset "name='Stereo DAC MIXR DAC R2 Switch' on" + cset "name='SPK MIXL DAC L1 Switch' on" + cset "name='SPK MIXR DAC R1 Switch' on" + cset "name='SPOL MIX SPKVOL L Switch' on" +# for mono speaker we apply left on right +# cset "name='SPOR MIX SPKVOL R Switch' on" + cset "name='SPOL MIX SPKVOL R Switch' on" + cset "name='Speaker Switch' on" + cset "name='Speaker Channel Switch' on" + cset "name='Headphone Switch' off" + cset "name='Speaker L Playback Switch' on" + cset "name='Speaker R Playback Switch' on" + cset "name='Speaker Playback Volume' 35" + + ] + + DisableSequence [ + cdev "hw:bytcrrt5640" + cset "name='Speaker Switch' off" + cset "name='Speaker Channel Switch' off" + cset "name='Speaker L Playback Switch' off" + cset "name='Speaker R Playback Switch' off" + cset "name='Speaker Playback Volume' 0" + ] + + Value { + PlaybackChannels "2" + } +} diff --git a/src/conf/ucm/rt5640/Speaker.conf b/src/conf/ucm/rt5640/Speaker.conf new file mode 100644 index 00000000..b745ed06 --- /dev/null +++ b/src/conf/ucm/rt5640/Speaker.conf @@ -0,0 +1,45 @@ +SectionDevice."Speaker" { + Comment "Speaker playback" + + ConflictingDevice [ + "Headphones" + "MonoSpeaker" + ] + + EnableSequence [ + cdev "hw:bytcrrt5640" + + cset "name='DAC MIXL INF1 Switch' on" + cset "name='DAC MIXR INF1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXL DAC L2 Switch' on" + cset "name='Stereo DAC MIXR DAC R2 Switch' on" + cset "name='SPK MIXL DAC L1 Switch' on" + cset "name='SPK MIXR DAC R1 Switch' on" + cset "name='SPOL MIX SPKVOL L Switch' on" + cset "name='SPOR MIX SPKVOL R Switch' on" + # undo MonoSpeaker mixing of right channel to left speaker + cset "name='SPOL MIX SPKVOL R Switch' off" + cset "name='Speaker Switch' on" + cset "name='Speaker Channel Switch' on" + cset "name='Headphone Switch' off" + cset "name='Speaker L Playback Switch' on" + cset "name='Speaker R Playback Switch' on" + cset "name='Speaker Playback Volume' 35" + + ] + + DisableSequence [ + cdev "hw:bytcrrt5640" + cset "name='Speaker Switch' off" + cset "name='Speaker Channel Switch' off" + cset "name='Speaker L Playback Switch' off" + cset "name='Speaker R Playback Switch' off" + cset "name='Speaker Playback Volume' 0" + ] + + Value { + PlaybackChannels "2" + } +} -- 2.17.0

1 1

[alsa-devel] Submitting a patch for tinycompress v1.1.5
by Anoush Khazeni 19 May '18

19 May '18

Submitting a patch to add the missing closing bracket for the extern "C" directive in "tinycompress.h" from release v1.1.5 tar file "tinycompress-1.1.5.tar.bz2"

1 0

[alsa-devel] [PATCH] ASoC: pcm512x: Add ACPI support
by Pierre-Louis Bossart 18 May '18

18 May '18

HID is assumed to be made of TI PCI ID (0x104C) + part number, so all four 104C5121, 104C5122, 104C5141 104C5142 are valid. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/codecs/pcm512x-i2c.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/pcm512x-i2c.c b/sound/soc/codecs/pcm512x-i2c.c index 5f9c069569d5..0fe5ced841a3 100644 --- a/sound/soc/codecs/pcm512x-i2c.c +++ b/sound/soc/codecs/pcm512x-i2c.c @@ -17,6 +17,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/i2c.h> +#include <linux/acpi.h> #include "pcm512x.h" @@ -52,6 +53,7 @@ static const struct i2c_device_id pcm512x_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id); +#if defined(CONFIG_OF) static const struct of_device_id pcm512x_of_match[] = { { .compatible = "ti,pcm5121", }, { .compatible = "ti,pcm5122", }, @@ -60,6 +62,18 @@ static const struct of_device_id pcm512x_of_match[] = { { } }; MODULE_DEVICE_TABLE(of, pcm512x_of_match); +#endif + +#ifdef CONFIG_ACPI +static const struct acpi_device_id pcm512x_acpi_match[] = { + { "104C5121", 0 }, + { "104C5122", 0 }, + { "104C5141", 0 }, + { "104C5142", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(acpi, pcm512x_acpi_match); +#endif static struct i2c_driver pcm512x_i2c_driver = { .probe = pcm512x_i2c_probe, @@ -67,7 +81,8 @@ static struct i2c_driver pcm512x_i2c_driver = { .id_table = pcm512x_i2c_id, .driver = { .name = "pcm512x", - .of_match_table = pcm512x_of_match, + .of_match_table = of_match_ptr(pcm512x_of_match), + .acpi_match_table = ACPI_PTR(pcm512x_acpi_match), .pm = &pcm512x_pm_ops, }, }; -- 2.14.1

4 4

[alsa-devel] [PATCH 00/19] ASoC: rt5640: Add jack-detect and button-press support
by Hans de Goede 18 May '18

18 May '18

Hi All, This series has been long in the making, but it is finally ready now. This series adds jack-detect support for rt5640 using devices. This is modelled after the recent rt5651 codec- and bytcr-rt5651 machine- driver jack-detect changes (which were actually based on a WIP version of this series). As discussed on the list already unfortunately there are no really good defaults which work everywhere, so patch 18 adds quirks for 10 devices, I've decided to do this in one go rather then split this into 10 patches. Patch 19 makes the bytcr-rt5640 set a longname based on the speaker and input-map quirks, so that userspace can pick a correct UCM profile based on the longname with working jack-detect based input / output switching. I've matching patches adding UCM profiles for this to alsa-lib here: https://github.com/jwrdegoede/alsa-lib/commits/master I'm waiting with submitting those upstream until patch 19 is accepted for merging. Regards, Hans

4 48

[alsa-devel] [PATCH] ASoC: ssm2305: fix header layout
by Marco Felsch 18 May '18

18 May '18

Make C-header and SPDX-License-Identifier header uniform. Signed-off-by: Marco Felsch <m.felsch(a)pengutronix.de> --- sound/soc/codecs/ssm2305.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/ssm2305.c b/sound/soc/codecs/ssm2305.c index 39d8b01cd852..2968959c4b75 100644 --- a/sound/soc/codecs/ssm2305.c +++ b/sound/soc/codecs/ssm2305.c @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 -/* - * Analog Devices SSM2305 Amplifier Driver - * - * Copyright (C) 2018 Pengutronix, Marco Felsch <kernel(a)pengutronix.de> - */ +// +// Analog Devices SSM2305 Amplifier Driver +// +// Copyright (C) 2018 Pengutronix, Marco Felsch <kernel(a)pengutronix.de> +// #include <linux/gpio/consumer.h> #include <linux/module.h> -- 2.17.0

2 1

[alsa-devel] [PATCH v1] ASoC: rt5677: Convert I2C driver to ->probe_new()
by Andy Shevchenko 18 May '18

18 May '18

There is no platform code that uses i2c module table. Remove it altogether and adjust ->probe() to be ->probe_new(). Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- sound/soc/codecs/rt5677.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index bc1a23dd7c2d..8a0181a2db08 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -5006,13 +5006,6 @@ static const struct regmap_config rt5677_regmap = { .num_ranges = ARRAY_SIZE(rt5677_ranges), }; -static const struct i2c_device_id rt5677_i2c_id[] = { - { "rt5677", RT5677 }, - { "rt5676", RT5676 }, - { } -}; -MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id); - static const struct of_device_id rt5677_of_match[] = { { .compatible = "realtek,rt5677", RT5677 }, { } @@ -5130,8 +5123,7 @@ static void rt5677_free_irq(struct i2c_client *i2c) regmap_del_irq_chip(i2c->irq, rt5677->irq_data); } -static int rt5677_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int rt5677_i2c_probe(struct i2c_client *i2c) { struct rt5677_priv *rt5677; int ret; @@ -5278,9 +5270,8 @@ static struct i2c_driver rt5677_i2c_driver = { .of_match_table = rt5677_of_match, .acpi_match_table = ACPI_PTR(rt5677_acpi_match), }, - .probe = rt5677_i2c_probe, + .probe_new = rt5677_i2c_probe, .remove = rt5677_i2c_remove, - .id_table = rt5677_i2c_id, }; module_i2c_driver(rt5677_i2c_driver); -- 2.17.0

2 1

[alsa-devel] sound: latency and synchronization measurements
by Muni Sekhar 18 May '18

18 May '18

[ Please keep me in CC as I'm not subscribed to the list] Hi All, I am trying to characterize the audio synchronization between two systems. There is a mechanism to route audio between two systems, we run ‘aplay’ at one system and ‘arecord’ in other system. We need to measure the time difference when audio sample is out at one port and arriving at another port in different system. I plan to add printk’s in “struct snd_pcm_ops” call backs, but does these call backs tells when it received first and last audio frames\samples? Or else please suggest any other best method. -- Thanks, Sekhar

3 4

[alsa-devel] [PATCH] ALSA: emu10k1: Rate-limit error messages about page errors
by Takashi Iwai 18 May '18

18 May '18

The error messages at sanity checks of memory pages tend to repeat too many times once when it hits, and without the rate limit, it may flood and become unreadable. Replace such messages with the *_ratelimited() variant. Bugzilla: http://bugzilla.opensuse.org/show_bug.cgi?id=1093027 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/emu10k1/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 5865f3b90b34..dbc7d8d0e1c4 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -248,13 +248,13 @@ search_empty(struct snd_emu10k1 *emu, int size) static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr) { if (addr & ~emu->dma_mask) { - dev_err(emu->card->dev, + dev_err_ratelimited(emu->card->dev, "max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr); return 0; } if (addr & (EMUPAGESIZE-1)) { - dev_err(emu->card->dev, "page is not aligned\n"); + dev_err_ratelimited(emu->card->dev, "page is not aligned\n"); return 0; } return 1; @@ -345,7 +345,7 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst else addr = snd_pcm_sgbuf_get_addr(substream, ofs); if (! is_valid_page(emu, addr)) { - dev_err(emu->card->dev, + dev_err_ratelimited(emu->card->dev, "emu: failure page = %d\n", idx); mutex_unlock(&hdr->block_mutex); return NULL; -- 2.16.3

2 2

[alsa-devel] [PATCH] ALSA: dice: fix a bounds check in snd_dice_detect_tcelectronic_formats()
by Dan Carpenter 18 May '18

18 May '18

The "entry" pointer is always non-NULL so this test for out of bounds won't work. Fixes: f1f0f330b1d0 ("ALSA: dice: add parameters of stream formats for models produced by TC Electronic") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/firewire/dice/dice-tcelectronic.c b/sound/firewire/dice/dice-tcelectronic.c index af8203b9d1a6..e134a5110c6c 100644 --- a/sound/firewire/dice/dice-tcelectronic.c +++ b/sound/firewire/dice/dice-tcelectronic.c @@ -75,13 +75,12 @@ int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice) } } - entry = NULL; for (i = 0; i < ARRAY_SIZE(entries); ++i) { entry = entries + i; if (entry->model_id == model_id) break; } - if (!entry) + if (i == ARRAY_SIZE(entries)) return -ENODEV; memcpy(dice->tx_pcm_chs, entry->spec->tx_pcm_chs,

3 2

[alsa-devel] [PATCH] ASoC: wm8904: fix spelling mistake: "Caputure" -> "Capture"
by Colin King 18 May '18

18 May '18

From: Colin Ian King <colin.king(a)canonical.com> Trivial fix to spelling mistake in SOC_ENUM literal string Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/wm8904.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 20fdcae06c6b..f13ef334c0d7 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -596,7 +596,7 @@ static const struct snd_kcontrol_new wm8904_adc_snd_controls[] = { SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8904_ADC_DIGITAL_VOLUME_LEFT, WM8904_ADC_DIGITAL_VOLUME_RIGHT, 1, 119, 0, digital_tlv), -SOC_ENUM("Left Caputure Mode", lin_mode), +SOC_ENUM("Left Capture Mode", lin_mode), SOC_ENUM("Right Capture Mode", rin_mode), /* No TLV since it depends on mode */ -- 2.17.0

2 1