June 2017 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] Dell USB audio driver workaround
by Takashi Iwai 21 Jun '17

21 Jun '17

On Wed, 06 Apr 2016 08:29:12 +0200, Kailang wrote: > > Hi Takashi, > > Dell had USB dock. > Maybe firmware issue, the master volume always keep at 0x57. > Attach patch will fix it to keep at Max volume. > > Could you help us to update it? Well, I don't get how this patch works.. > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index 4f85757..84d9a4e 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -846,6 +846,12 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, > { > struct snd_usb_audio *chip = cval->head.mixer->chip; > switch (chip->usb_id) { > + case USB_ID(0x0bda, 0x4014): /* Dell workaround */ > + if (strstr(kctl->id.name, "Playback Volume") != NULL) { > + cval->min = 0x0000; > + cval->max = 0x0000; > + } > + break; So, this means that this value has to be fixed to 0? If yes, can't we simply remove this volume instead? thanks, Takashi

4 16

Re: [alsa-devel] Support headset mode for ALC274
by Takashi Iwai 20 Jun '17

20 Jun '17

On Tue, 20 Jun 2017 10:50:57 +0200, Kailang wrote: > > Hi Takashi, > > Attach patch is support headset mode for ALC234/ALC274/ALC294. > > Many Thanks. Applied, thanks. Takashi

1 0

[alsa-devel] [PATCH alsa-lib 1/2] USB-Audio: fix dsnoop args for Audiophile USB card
by Alexander Tsoy 20 Jun '17

20 Jun '17

Fixes: a9b129955659 ("USB-Audio.conf: fix definition for M-Audio AudioP...") Signed-off-by: Alexander Tsoy <alexander(a)tsoy.me> --- src/conf/cards/USB-Audio.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index e365f297..f72ef121 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -90,7 +90,7 @@ USB-Audio."Audiophile USB (tm)".pcm.default { type plug slave.pcm { @func concat - strings [ "dsnoop:DEVICE=1,CARD=" $CARD ] + strings [ "dsnoop:DEV=1,CARD=" $CARD ] } } } -- 2.13.0

2 3

[alsa-devel] [PATCH 1/2] ALSA: line6: add support for POD HD500X
by Hans P. Möller Ebner 20 Jun '17

20 Jun '17

Add support for the Line6 POD HD500X multi effect processor for playback and capture (in/out audio) through USB. Signed-off-by: Hans P. Moller <hmoller(a)uc.cl> --- sound/usb/line6/podhd.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 6ab23e5..e389f92 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -3,6 +3,7 @@ * * Copyright (C) 2011 Stefan Hajnoczi <stefanha(a)gmail.com> * Copyright (C) 2015 Andrej Krutak <dev(a)andree.sk> + * Copyright (C) 2015 Hans P. Moller <hmoller(a)uc.cl> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -37,7 +38,8 @@ enum { LINE6_PODHD500_0, LINE6_PODHD500_1, LINE6_PODX3, - LINE6_PODX3LIVE + LINE6_PODX3LIVE, + LINE6_PODHD500X }; struct usb_line6_podhd { @@ -372,6 +374,7 @@ static const struct usb_device_id podhd_id_table[] = { { LINE6_IF_NUM(0x414D, 1), .driver_info = LINE6_PODHD500_1 }, { LINE6_IF_NUM(0x414A, 0), .driver_info = LINE6_PODX3 }, { LINE6_IF_NUM(0x414B, 0), .driver_info = LINE6_PODX3LIVE }, + { LINE6_IF_NUM(0x4159, 0), .driver_info = LINE6_PODHD500X }, {} }; @@ -446,6 +449,18 @@ static const struct line6_properties podhd_properties_table[] = { .ep_audio_r = 0x86, .ep_audio_w = 0x02, }, + [LINE6_PODHD500X] = { + .id = "PODHD500X", + .name = "POD HD500X", + .capabilities = LINE6_CAP_CONTROL + | LINE6_CAP_PCM | LINE6_CAP_HWMON, + .altsetting = 1, + .ep_ctrl_r = 0x81, + .ep_ctrl_w = 0x01, + .ctrl_if = 1, + .ep_audio_r = 0x86, + .ep_audio_w = 0x02, + }, }; /* -- 2.7.4

4 7

[alsa-devel] [RESEND] topology: Add parsing for rates from conf
by Guneshwor Singh 20 Jun '17

20 Jun '17

In alsa-lib topology parser, rate_min and rate_max are parsed currently. Add support to parse rates also. Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- include/topology.h | 1 + src/topology/pcm.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ src/topology/tplg_local.h | 20 +++++++++++++ 3 files changed, 92 insertions(+) diff --git a/include/topology.h b/include/topology.h index ccb3a004..42d23762 100644 --- a/include/topology.h +++ b/include/topology.h @@ -534,6 +534,7 @@ extern "C" { * SectionPCMCapabilities."name" { * * formats "S24_LE,S16_LE" # Supported formats + * rates "48000" # Supported rates * rate_min "48000" # Max supported sample rate * rate_max "48000" # Min supported sample rate * channels_min "2" # Min number of channels diff --git a/src/topology/pcm.c b/src/topology/pcm.c index 0f4deb4f..bb63142e 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -20,6 +20,26 @@ #include "list.h" #include "tplg_local.h" +#define RATE(v) [SND_PCM_RATE_##v] = #v + +static const char *const snd_pcm_rate_names[] = { + RATE(5512), + RATE(8000), + RATE(11025), + RATE(16000), + RATE(22050), + RATE(32000), + RATE(44100), + RATE(48000), + RATE(64000), + RATE(88200), + RATE(96000), + RATE(176400), + RATE(192000), + RATE(CONTINUOUS), + RATE(KNOT), +}; + struct tplg_elem *lookup_pcm_dai_stream(struct list_head *base, const char* id) { struct list_head *pos; @@ -309,6 +329,42 @@ static int split_format(struct snd_soc_tplg_stream_caps *caps, char *str) return 0; } +static int get_rate_value(const char* name) +{ + int rate; + for (rate = 0; rate <= SND_PCM_RATE_LAST; rate++) { + if (snd_pcm_rate_names[rate] && + strcasecmp(name, snd_pcm_rate_names[rate]) == 0) { + return rate; + } + } + + return SND_PCM_RATE_UNKNOWN; +} + +static int split_rate(struct snd_soc_tplg_stream_caps *caps, char *str) +{ + char *s = NULL; + snd_pcm_rates_t rate; + int i = 0; + + s = strtok(str, ","); + while (s) { + rate = get_rate_value(s); + + if (rate == SND_PCM_RATE_UNKNOWN) { + SNDERR("error: unsupported stream rate %s\n", s); + return -EINVAL; + } + + caps->rates |= 1 << rate; + s = strtok(NULL, ", "); + i++; + } + + return 0; +} + /* Parse pcm stream capabilities */ int tplg_parse_stream_caps(snd_tplg_t *tplg, snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) @@ -360,6 +416,21 @@ int tplg_parse_stream_caps(snd_tplg_t *tplg, continue; } + if (strcmp(id, "rates") == 0) { + s = strdup(val); + if (!s) + return -ENOMEM; + + err = split_rate(sc, s); + free(s); + + if (err < 0) + return err; + + tplg_dbg("\t\t%s: %s\n", id, val); + continue; + } + if (strcmp(id, "rate_min") == 0) { sc->rate_min = atoi(val); tplg_dbg("\t\t%s: %d\n", id, sc->rate_min); diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h index 60af0177..af599145 100644 --- a/src/topology/tplg_local.h +++ b/src/topology/tplg_local.h @@ -37,6 +37,26 @@ struct tplg_ref; struct tplg_elem; +typedef enum _snd_pcm_rates { + SND_PCM_RATE_UNKNOWN = -1, + SND_PCM_RATE_5512 = 0, + SND_PCM_RATE_8000, + SND_PCM_RATE_11025, + SND_PCM_RATE_16000, + SND_PCM_RATE_22050, + SND_PCM_RATE_32000, + SND_PCM_RATE_44100, + SND_PCM_RATE_48000, + SND_PCM_RATE_64000, + SND_PCM_RATE_88200, + SND_PCM_RATE_96000, + SND_PCM_RATE_176400, + SND_PCM_RATE_192000, + SND_PCM_RATE_CONTINUOUS = 30, + SND_PCM_RATE_KNOT = 31, + SND_PCM_RATE_LAST = SND_PCM_RATE_KNOT, +} snd_pcm_rates_t; + struct snd_tplg { /* opaque vendor data */ -- 2.13.0

2 1

[alsa-devel] [PATCH 0/2] ALSA: add const to snd_ratnum structures
by Bhumika Goyal 20 Jun '17

20 Jun '17

Declare snd_ratnum structures as const as their reference is only stored in the rate field of a snd_pcm_hw_constraint_ratnums structure. This field is of type const, so snd_ratnum structures can be made const. Bhumika Goyal (2): ALSA: sound/isa: constify snd_ratnum structures ALSA: sound/pci: add const to snd_ratnum structures sound/isa/gus/gus_pcm.c | 2 +- sound/isa/sb/sb8_main.c | 2 +- sound/pci/bt87x.c | 2 +- sound/pci/ens1370.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) -- 2.7.4

2 3

[alsa-devel] [PATCH][next] ASoC: rsnd: make main_rate signed to check for -ve error return codes
by Colin King 20 Jun '17

20 Jun '17

From: Colin Ian King <colin.king(a)canonical.com> The comparison of main_rate < 0 has no effect because main_rate is an unsigned int. Make it signed so that any -ve error returns from the call to rsnd_clk_query can be detected. Detected by CoverityScan, CID#1446152 ("Unsigned compared against 0") Fixes: ef4cf5d6a143e0 ("ASoC: rsnd: add rsnd_ssi_clk_query()") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/sh/rcar/ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index c8956c3484dd..d220512918f9 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -258,7 +258,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); int chan = rsnd_runtime_channel_for_ssi(io); int idx, ret; - unsigned int main_rate; + int main_rate; unsigned int rate = rsnd_io_is_play(io) ? rsnd_src_get_out_rate(priv, io) : rsnd_src_get_in_rate(priv, io); -- 2.11.0

2 1

[alsa-devel] [PATCH 1/1] ASoC: stm32: change configuration flag
by olivier moysan 19 Jun '17

19 Jun '17

Use a specific flag for SAI and I2S interfaces, instead of common flag. Signed-off-by: olivier moysan <olivier.moysan(a)st.com> --- sound/soc/stm/Kconfig | 19 ++++++++++++++++--- sound/soc/stm/Makefile | 6 +++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig index a6372de..23600a5 100644 --- a/sound/soc/stm/Kconfig +++ b/sound/soc/stm/Kconfig @@ -1,8 +1,21 @@ -menuconfig SND_SOC_STM32 - tristate "STMicroelectronics STM32 SOC audio support" +menu "STMicroelectronics STM32 SOC audio support" + +config SND_SOC_STM32_SAI + tristate "STM32 SAI interface (Serial Audio Interface) support" depends on ARCH_STM32 || COMPILE_TEST depends on SND_SOC select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO help - Say Y if you want to enable ASoC support for STM32 + Say Y if you want to enable SAI for STM32 + +config SND_SOC_STM32_I2S + tristate "STM32 I2S interface (SPI/I2S block) support" + depends on ARCH_STM32 || COMPILE_TEST + depends on SND_SOC + select SND_SOC_GENERIC_DMAENGINE_PCM + select REGMAP_MMIO + help + Say Y if you want to enable I2S for STM32 + +endmenu diff --git a/sound/soc/stm/Makefile b/sound/soc/stm/Makefile index 8251931..4140c67 100644 --- a/sound/soc/stm/Makefile +++ b/sound/soc/stm/Makefile @@ -1,10 +1,10 @@ # SAI snd-soc-stm32-sai-sub-objs := stm32_sai_sub.o -obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-sai-sub.o +obj-$(CONFIG_SND_SOC_STM32_SAI) += snd-soc-stm32-sai-sub.o snd-soc-stm32-sai-objs := stm32_sai.o -obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-sai.o +obj-$(CONFIG_SND_SOC_STM32_SAI) += snd-soc-stm32-sai.o # I2S snd-soc-stm32-i2s-objs := stm32_i2s.o -obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-i2s.o +obj-$(CONFIG_SND_SOC_STM32_I2S) += snd-soc-stm32-i2s.o -- 1.9.1

2 1

[alsa-devel] [PATCH v2 0/3] ASoC: Intel: Skylake: Add deep buffer support
by Subhransu S. Prusty 19 Jun '17

19 Jun '17

Now that we can configure DSP dma buffer size, the device can support deep buffer playback. DSP fetches large buffer and can result fewer wakes, which helps in power reduction. So this series first adds a token in topology to get dma_buffer_size and sends to firmware after conversion. Also ads a deepbuffer device to use this support. v1->v2 Remove an unrelated change. Ramesh Babu (2): ASoC: Intel: Skylake: Add deep buffer support ASoC: Intel: Skylake: Fix dma buffer size calculation Subhransu S. Prusty (1): ASoC: skl_rt286: Add deepbuffer dai link include/uapi/sound/snd_sst_tokens.h | 5 ++++- sound/soc/intel/boards/skl_rt286.c | 18 ++++++++++++++++++ sound/soc/intel/skylake/skl-messages.c | 29 +++++++++++++++++++++++++---- sound/soc/intel/skylake/skl-topology.c | 4 ++++ sound/soc/intel/skylake/skl-topology.h | 1 + 5 files changed, 52 insertions(+), 5 deletions(-) -- 1.9.1

3 5

[alsa-devel] [PATCH 0/3] ASoC: Intel: Skylake: Add deep buffer support
by Subhransu S. Prusty 19 Jun '17

19 Jun '17

Now that we can configure DSP dma buffer size, the device can support deep buffer playback. DSP fetches large buffer and can result fewer wakes, which helps in power reduction. So this series first adds a token in topology to get dma_buffer_size and sends to firmware after conversion. Also ads a deepbuffer device to use this support. Ramesh Babu (2): ASoC: Intel: Skylake: Add deep buffer support ASoC: Intel: Skylake: Fix dma buffer size calculation Subhransu S. Prusty (1): ASoC: skl_rt286: Add deepbuffer dai link include/uapi/sound/snd_sst_tokens.h | 7 +++++-- sound/soc/intel/boards/skl_rt286.c | 18 ++++++++++++++++++ sound/soc/intel/skylake/skl-messages.c | 29 +++++++++++++++++++++++++---- sound/soc/intel/skylake/skl-topology.c | 4 ++++ sound/soc/intel/skylake/skl-topology.h | 1 + 5 files changed, 53 insertions(+), 6 deletions(-) -- 1.9.1

2 5