October 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: topology: Reenable use from userspace
by Mark Brown 11 Oct '16

11 Oct '16

We had inserted a #error into the topology UAPI code to ensure that the ABI was not adopted by userspace while final review and testing was ongoing. Since we are now comfortable that the ABI is suitable for production remove the #error, future changes will include provision for backwards compatibility. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Are we OK with this? Looking for some acks and reviews... include/uapi/sound/asoc.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 247c50b..51b8066 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -18,12 +18,6 @@ #include <linux/types.h> #include <sound/asound.h> -#ifndef __KERNEL__ -#error This API is an early revision and not enabled in the current -#error kernel release, it will be enabled in a future kernel version -#error with incompatible changes to what is here. -#endif - /* * Maximum number of channels topology kcontrol can represent. */ -- 2.6.1

4 6

[alsa-devel] [PATCH] ASoC: Intel: haswell depends on sst-firmware
by Arnd Bergmann 11 Oct '16

11 Oct '16

The Intel Haswell audio support fails to link if CONFIG_SND_SOC_INTEL_SST_FIRMWARE is disabled: sst-haswell-dsp.c: undefined reference to `sst_mem_block_register' sst-haswell-dsp.c: undefined reference to `sst_mem_block_unregister_all' sst-haswell-dsp.c: undefined reference to `sst_module_alloc_blocks' sst-haswell-dsp.c: undefined reference to `sst_module_free' sst-haswell-dsp.c: undefined reference to `sst_module_new' sst-haswell-pcm.c: undefined reference to `sst_module_get_from_id' sst-haswell-pcm.c: undefined reference to `sst_module_runtime_restore' sst-haswell-pcm.c: undefined reference to `sst_module_runtime_save' ERROR: "sst_block_alloc_scratch" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_block_free_scratch" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_copyfrom" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_copyto" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_get_channel" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_put_channel" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_free" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_get_offset" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_new" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_free_all" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_new" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_reload" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_unload" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_module_runtime_alloc_blocks" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_module_runtime_get_from_id" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_module_runtime_new" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! This moves the 'select' statement from two of the three haswell based users into the line that is used by all of them, so make it harder to get wrong and to fix the existing randconfig regressions. Fixes: 2d995e5dc283 ("ASoC: Intel: boards: Add bdw-rt5677 machine driver") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/intel/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 26eb5a0a5575..fd5d1e091038 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -47,6 +47,7 @@ config SND_SOC_INTEL_SST_MATCH config SND_SOC_INTEL_HASWELL tristate + select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_BAYTRAIL tristate @@ -56,7 +57,6 @@ config SND_SOC_INTEL_HASWELL_MACH depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM depends on DW_DMAC_CORE select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help @@ -138,7 +138,6 @@ config SND_SOC_INTEL_BROADWELL_MACH I2C_DESIGNWARE_PLATFORM depends on DW_DMAC_CORE select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT286 help -- 2.9.0

2 1

[alsa-devel] [PATCH 0/5] topology: Upgrade ABI to match kernel v4.8
by mengdong.lin＠linux.intel.com 11 Oct '16

11 Oct '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Now the topology ABI version in kernel is 5, added types for BE (Backend) DAIs and sig_bits in stream caps. But the ABI version in alsa-lib is still 4, without above ABI update. Since the kernel merge window is open and the remaining topology ABI update (v3 kernel patch series) cannot be accepted atm. So we use this series to fix the ABI mismatch between kernel v4.8 and user space, by adding types for BE DAIs and sig_bits to stream caps and pumping topolpgy ABI version to 5 as well. This patch series also completes the support for BE DAIs. Guneshwor Singh (3): topology: Parse BE DAIs in text conf file topology: Support configuring BE DAIs by C API topology: Export BE DAIs to the binary for kernel Mengdong Lin (2): topology: ABI - Add the types for BE DAI topology: ABI - Add sig_bits to stream caps include/sound/asoc.h | 35 ++++++- include/topology.h | 45 +++++++++ src/topology/builder.c | 11 +++ src/topology/data.c | 4 + src/topology/elem.c | 4 + src/topology/parser.c | 16 ++++ src/topology/pcm.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++ src/topology/tplg_local.h | 7 ++ 8 files changed, 358 insertions(+), 2 deletions(-) -- 2.5.0

3 8

Re: [alsa-devel] Audio on mx6q udoo
by Fabio Estevam 10 Oct '16

10 Oct '16

Hi Maciej, On Thu, Oct 6, 2016 at 8:17 PM, Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> wrote: > If I remember correctly I had some problem if SDMA driver was built-in > into kernel (it didn't load firmware correctly or so). > Not sure that the problem was with sound but maybe this is worth checking. I am not loading any external SDMA firmware. Haven't had a chance to try your config yet, but will investigate on the SDMA module versus built-in and also about the SDMA firmware. Thanks

1 0

[alsa-devel] Preferred way to keep mixer mute in sync with digital_mute callback
by Pascal Huerst 10 Oct '16

10 Oct '16

Hey everyone, I'm currently having an issue with cs4271. The codec plays back, even if mute is activated in alsa mixer. This is caused by the digital_mute callback, that does not care about the current mute status in alsa mixer. As a user, I would expect, that if mute is set in alsa mixer, I don't get any output if I play something back. (But probably I'm wrong?). On the other hand, wm8350 codec uses a flag in the driver struct, that stores the current state of mute in alsa mixer, which is taken into consideration in the digital_mute callback. But to make this possible, one can not just use: SOC_*() for example, but has to create a put-function using: SOC_*_EXT() only to get and store that flag. Is this really the way to go, or did I miss something? Thanks, Pascal

1 0

Re: [alsa-devel] [PATCH v2] ASoC: sgtl5000: add headphone and LINEOUT mute controls
by Mark Brown 10 Oct '16

10 Oct '16

On Mon, Oct 10, 2016 at 02:52:38PM +0200, Richard Leitner wrote: > On 09/09/2016 12:17 PM, Mark Brown wrote: > > Please don't send content free pings and please allow a reasonable time > > for review. People get busy, go on holiday, attend conferences and so > > on so unless there is some reason for urgency (like critical bug fixes) > > please allow at least a couple of weeks for review. If there have been > > review comments then people may be waiting for those to be addressed. > > Sending content free pings just adds to the mail volume (if they are > > seen at all) and if something has gone wrong you'll have to resend the > > patches anyway. > So it's been a month now, is this a reasonable time to ping? To repeat please don't send content free pings at all for the reasons explained above.

1 0

[alsa-devel] [PATCH] ALSA: line6: Fix POD X3 Live audio input
by Andrej Krutak 10 Oct '16

10 Oct '16

The commit c039aaa77a7d1d9375665a8b59ec16dc7d23e259 was incomplete, missing part of the setup for Live. This makes also audio input work, in addition to audio output. Signed-off-by: Andrej Krutak <dev(a)andree.sk> Reported-by: Eddi De Pieri <eddi(a)depieri.net> Fixes: c039aaa77a7d1d9375665a8b59ec16dc7d23e259 --- sound/usb/line6/podhd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 193eb29..ac40525 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -317,7 +317,8 @@ static int podhd_init(struct usb_line6 *line6, if (pod->line6.properties->capabilities & LINE6_CAP_PCM) { /* initialize PCM subsystem: */ err = line6_init_pcm(line6, - (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : + (id->driver_info == LINE6_PODX3 || + id->driver_info == LINE6_PODX3LIVE) ? &podx3_pcm_properties : &podhd_pcm_properties); if (err < 0) return err; -- 2.7.4

2 1

[alsa-devel] [PATCH] conf/ucm: skylake: add skylake-rt286 conf files
by Vinod Koul 10 Oct '16

10 Oct '16

This add the UCM conf files for skylake enabling I2S audio, HDMI and DMIC ports. Signed-off-by: Karthik D M <karthik.d.m(a)intel.com> Signed-off-by: Nishit Sharma <nishitx.sharma(a)intel.com> Signed-off-by: Jeeja KP <jeeja.kp(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- configure.ac | 1 + src/conf/ucm/Makefile.am | 2 +- src/conf/ucm/skylake-rt286/Hdmi1 | 20 ++++ src/conf/ucm/skylake-rt286/Hdmi2 | 20 ++++ src/conf/ucm/skylake-rt286/HiFi | 129 ++++++++++++++++++++++++++ src/conf/ucm/skylake-rt286/Makefile.am | 4 + src/conf/ucm/skylake-rt286/skylake-rt286.conf | 60 ++++++++++++ 7 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 src/conf/ucm/skylake-rt286/Hdmi1 create mode 100644 src/conf/ucm/skylake-rt286/Hdmi2 create mode 100644 src/conf/ucm/skylake-rt286/HiFi create mode 100644 src/conf/ucm/skylake-rt286/Makefile.am create mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf diff --git a/configure.ac b/configure.ac index a1de230e588c..0dfbe81c6595 100644 --- a/configure.ac +++ b/configure.ac @@ -673,6 +673,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/PAZ00/Makefile \ src/conf/ucm/GoogleNyan/Makefile \ src/conf/ucm/broadwell-rt286/Makefile \ + src/conf/ucm/skylake-rt286/Makefile \ src/conf/ucm/VEYRON-I2S/Makefile \ src/conf/ucm/chtrt5645/Makefile \ src/conf/ucm/DB410c/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 7bf432e70e26..a11d324e785b 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 VEYRON-I2S chtrt5645 DB410c +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c diff --git a/src/conf/ucm/skylake-rt286/Hdmi1 b/src/conf/ucm/skylake-rt286/Hdmi1 new file mode 100644 index 000000000000..0e00fc844301 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/Hdmi1 @@ -0,0 +1,20 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi1" { + Comment "HDMI/Display Port 1 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:skylakert286,4" + PlaybackChannels "2" + PlaybackPriority "3" + JackControl "HDMI/DP, pcm=4 Jack" + } +} + diff --git a/src/conf/ucm/skylake-rt286/Hdmi2 b/src/conf/ucm/skylake-rt286/Hdmi2 new file mode 100644 index 000000000000..89b31aa4b8f9 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/Hdmi2 @@ -0,0 +1,20 @@ +# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi2" { + Comment "HDMI/Display Port 2 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:skylakert286,5" + PlaybackChannels "2" + PlaybackPriority "4" + JackControl "HDMI/DP, pcm=5 Jack" + } +} + diff --git a/src/conf/ucm/skylake-rt286/HiFi b/src/conf/ucm/skylake-rt286/HiFi new file mode 100644 index 000000000000..41638f4cb9c8 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/HiFi @@ -0,0 +1,129 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in I2S mode on Intel SKYLAKE/KABYLAKE platforms + +SectionVerb { + + EnableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + ] + + DisableSequence [ + cdev "hw:skylakert286" + ] + + Value { + TQ "HiFi" + CapturePCM "hw:skylakert286,1" + PlaybackPCM "hw:skylakert286,0" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='HPO L Switch' 1" + cset "name='HPO R Switch' 1" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + ] + + DisableSequence [ + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='SPO Switch' 1" + cset "name='Speaker Playback Switch' 1,1" + cset "name='Speaker Switch' 1" + cset "name='HPO L Switch' 0" + cset "name='HPO R Switch' 0" + ] + + DisableSequence [ + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackHWMute "Headphones" + } +} + +SectionDevice."Headset" { + Comment "Headset Mic" + + ConflictingDevice [ + "dmiccap" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='ADC 0 Mux' 0" + cset "name='Mic Jack Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + ] + + DisableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + JackControl "Mic Jack" + } +} + + +SectionDevice."dmiccap" { + Comment "DMIC Stereo" + + ConflictingDevice [ + "Headpset" + ] + + EnableSequence [ + + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 0,0" + cset "name='Mic Jack Switch' 0" + cset "name='ADC 0 Mux' 0" + + ] + + DisableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + } +} + diff --git a/src/conf/ucm/skylake-rt286/Makefile.am b/src/conf/ucm/skylake-rt286/Makefile.am new file mode 100644 index 000000000000..9d6a85a5bdcf --- /dev/null +++ b/src/conf/ucm/skylake-rt286/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/skylake-rt286 +ucm_DATA = skylake-rt286.conf HiFi Hdmi1 Hdmi2 +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/skylake-rt286/skylake-rt286.conf b/src/conf/ucm/skylake-rt286/skylake-rt286.conf new file mode 100644 index 000000000000..64e852c479e3 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/skylake-rt286.conf @@ -0,0 +1,60 @@ +# UCM for Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionUseCase."HiFi" { + File "HiFi" + Comment "Play and record HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "Hdmi1" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "Hdmi2" + Comment "Play on Hdmi/DP 2" +} + +ValueDefaults { + PlaybackCTL "hw:skylakert286" + CaptureCTL "hw:skylakert286" + CaptureChannels "2" + CapturePriority "2" +} + +SectionDefaults [ + cdev "hw:skylakert286" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='ADC0 Capture Volume' 105,105" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='AMIC Volume' 3" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +] -- 1.9.1

2 1

[alsa-devel] 18i20 2nd Gen no ALSA mixer
by Happy 10 Oct '16

10 Oct '16

It was reported that Focusrite 18i20 Gen 2 seems not 100% compatible with the 18i20 Gen 1. It can work, but no ALSA Mixer support. What information does ALSA team need to get this fixed (USB Device ID) P.S: How to pull the ALSA driver code to to change it and test such fixon Ubuntu ? Any tutorial, step by step instruction ?

1 0

[alsa-devel] [PATCH] conf/ucm: skylake: add skylake-rt296 conf files
by Vinod Koul 07 Oct '16

07 Oct '16

This add the UCM conf files for skylake enabling I2S audio, HDMI and DMIC ports. Signed-off-by: Karthik D M <karthik.d.m(a)intel.com> Signed-off-by: Nishit Sharma <nishitx.sharma(a)intel.com> Signed-off-by: Jeeja KP <jeeja.kp(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- configure.ac | 1 + src/conf/ucm/Makefile.am | 2 +- src/conf/ucm/skylake-rt286/Hdmi1 | 20 ++++ src/conf/ucm/skylake-rt286/Hdmi2 | 20 ++++ src/conf/ucm/skylake-rt286/HiFi | 129 ++++++++++++++++++++++++++ src/conf/ucm/skylake-rt286/Makefile.am | 4 + src/conf/ucm/skylake-rt286/skylake-rt286.conf | 60 ++++++++++++ 7 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 src/conf/ucm/skylake-rt286/Hdmi1 create mode 100644 src/conf/ucm/skylake-rt286/Hdmi2 create mode 100644 src/conf/ucm/skylake-rt286/HiFi create mode 100644 src/conf/ucm/skylake-rt286/Makefile.am create mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf diff --git a/configure.ac b/configure.ac index a1de230e588c..0dfbe81c6595 100644 --- a/configure.ac +++ b/configure.ac @@ -673,6 +673,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/PAZ00/Makefile \ src/conf/ucm/GoogleNyan/Makefile \ src/conf/ucm/broadwell-rt286/Makefile \ + src/conf/ucm/skylake-rt286/Makefile \ src/conf/ucm/VEYRON-I2S/Makefile \ src/conf/ucm/chtrt5645/Makefile \ src/conf/ucm/DB410c/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 7bf432e70e26..a11d324e785b 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 VEYRON-I2S chtrt5645 DB410c +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c diff --git a/src/conf/ucm/skylake-rt286/Hdmi1 b/src/conf/ucm/skylake-rt286/Hdmi1 new file mode 100644 index 000000000000..0e00fc844301 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/Hdmi1 @@ -0,0 +1,20 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi1" { + Comment "HDMI/Display Port 1 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:skylakert286,4" + PlaybackChannels "2" + PlaybackPriority "3" + JackControl "HDMI/DP, pcm=4 Jack" + } +} + diff --git a/src/conf/ucm/skylake-rt286/Hdmi2 b/src/conf/ucm/skylake-rt286/Hdmi2 new file mode 100644 index 000000000000..89b31aa4b8f9 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/Hdmi2 @@ -0,0 +1,20 @@ +# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi2" { + Comment "HDMI/Display Port 2 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:skylakert286,5" + PlaybackChannels "2" + PlaybackPriority "4" + JackControl "HDMI/DP, pcm=5 Jack" + } +} + diff --git a/src/conf/ucm/skylake-rt286/HiFi b/src/conf/ucm/skylake-rt286/HiFi new file mode 100644 index 000000000000..41638f4cb9c8 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/HiFi @@ -0,0 +1,129 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in I2S mode on Intel SKYLAKE/KABYLAKE platforms + +SectionVerb { + + EnableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + ] + + DisableSequence [ + cdev "hw:skylakert286" + ] + + Value { + TQ "HiFi" + CapturePCM "hw:skylakert286,1" + PlaybackPCM "hw:skylakert286,0" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='HPO L Switch' 1" + cset "name='HPO R Switch' 1" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + ] + + DisableSequence [ + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='SPO Switch' 1" + cset "name='Speaker Playback Switch' 1,1" + cset "name='Speaker Switch' 1" + cset "name='HPO L Switch' 0" + cset "name='HPO R Switch' 0" + ] + + DisableSequence [ + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackHWMute "Headphones" + } +} + +SectionDevice."Headset" { + Comment "Headset Mic" + + ConflictingDevice [ + "dmiccap" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='ADC 0 Mux' 0" + cset "name='Mic Jack Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + ] + + DisableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + JackControl "Mic Jack" + } +} + + +SectionDevice."dmiccap" { + Comment "DMIC Stereo" + + ConflictingDevice [ + "Headpset" + ] + + EnableSequence [ + + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 0,0" + cset "name='Mic Jack Switch' 0" + cset "name='ADC 0 Mux' 0" + + ] + + DisableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + } +} + diff --git a/src/conf/ucm/skylake-rt286/Makefile.am b/src/conf/ucm/skylake-rt286/Makefile.am new file mode 100644 index 000000000000..9d6a85a5bdcf --- /dev/null +++ b/src/conf/ucm/skylake-rt286/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/skylake-rt286 +ucm_DATA = skylake-rt286.conf HiFi Hdmi1 Hdmi2 +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/skylake-rt286/skylake-rt286.conf b/src/conf/ucm/skylake-rt286/skylake-rt286.conf new file mode 100644 index 000000000000..64e852c479e3 --- /dev/null +++ b/src/conf/ucm/skylake-rt286/skylake-rt286.conf @@ -0,0 +1,60 @@ +# UCM for Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionUseCase."HiFi" { + File "HiFi" + Comment "Play and record HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "Hdmi1" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "Hdmi2" + Comment "Play on Hdmi/DP 2" +} + +ValueDefaults { + PlaybackCTL "hw:skylakert286" + CaptureCTL "hw:skylakert286" + CaptureChannels "2" + CapturePriority "2" +} + +SectionDefaults [ + cdev "hw:skylakert286" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='ADC0 Capture Volume' 105,105" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='AMIC Volume' 3" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +] -- 1.9.1

1 1