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

[alsa-devel] Pull request testing (please ignore)
by GitHub pull_request-opened 02 Nov '18

02 Nov '18

alsa-project/alsa-lib pull request #1 was opened from perexg: Comment body Issue URL : https://github.com/alsa-project/alsa-lib/pull/1 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] [PATCH] ASoC: wm97xx: fix uninitialized regmap pointer problem
by Arnd Bergmann 02 Nov '18

02 Nov '18

gcc notices that without either the ac97 bus or the pdata, we never initialize the regmap pointer, which leads to an uninitialized variable access: sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe': sound/soc/codecs/wm9712.c:666:2: error: 'regmap' may be used uninitialized in this function [-Werror=maybe-uninitialized] Since that configuration is invalid, it's better to return an error here. I tried to avoid adding complexity to the conditions, and turned the #ifdef into a regular if(IS_ENABLED()) check for readability. This in turn requires moving some header file declarations out of an #ifdef. The same code is used in three drivers, all of which I'm changing the same way. Fixes: 2ed1a8e0ce8d ("ASoC: wm9712: add ac97 new bus support") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- include/sound/soc.h | 2 +- sound/soc/codecs/wm9705.c | 10 ++++------ sound/soc/codecs/wm9712.c | 10 ++++------ sound/soc/codecs/wm9713.c | 10 ++++------ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 70c10a8f3e90..3e0ac310a3df 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -553,12 +553,12 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, } #endif -#ifdef CONFIG_SND_SOC_AC97_BUS struct snd_ac97 *snd_soc_alloc_ac97_component(struct snd_soc_component *component); struct snd_ac97 *snd_soc_new_ac97_component(struct snd_soc_component *component, unsigned int id, unsigned int id_mask); void snd_soc_free_ac97_component(struct snd_ac97 *ac97); +#ifdef CONFIG_SND_SOC_AC97_BUS int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops); int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops, struct platform_device *pdev); diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index ccdf088461b7..54c306707c02 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -325,8 +325,7 @@ static int wm9705_soc_probe(struct snd_soc_component *component) if (wm9705->mfd_pdata) { wm9705->ac97 = wm9705->mfd_pdata->ac97; regmap = wm9705->mfd_pdata->regmap; - } else { -#ifdef CONFIG_SND_SOC_AC97_BUS + } else if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) { wm9705->ac97 = snd_soc_new_ac97_component(component, WM9705_VENDOR_ID, WM9705_VENDOR_ID_MASK); if (IS_ERR(wm9705->ac97)) { @@ -339,7 +338,8 @@ static int wm9705_soc_probe(struct snd_soc_component *component) snd_soc_free_ac97_component(wm9705->ac97); return PTR_ERR(regmap); } -#endif + } else { + return -ENXIO; } snd_soc_component_set_drvdata(component, wm9705->ac97); @@ -350,14 +350,12 @@ static int wm9705_soc_probe(struct snd_soc_component *component) static void wm9705_soc_remove(struct snd_soc_component *component) { -#ifdef CONFIG_SND_SOC_AC97_BUS struct wm9705_priv *wm9705 = snd_soc_component_get_drvdata(component); - if (!wm9705->mfd_pdata) { + if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS) && !wm9705->mfd_pdata) { snd_soc_component_exit_regmap(component); snd_soc_free_ac97_component(wm9705->ac97); } -#endif } static const struct snd_soc_component_driver soc_component_dev_wm9705 = { diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index e873baa9e778..01949eaba4fd 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -642,8 +642,7 @@ static int wm9712_soc_probe(struct snd_soc_component *component) if (wm9712->mfd_pdata) { wm9712->ac97 = wm9712->mfd_pdata->ac97; regmap = wm9712->mfd_pdata->regmap; - } else { -#ifdef CONFIG_SND_SOC_AC97_BUS + } else if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) { int ret; wm9712->ac97 = snd_soc_new_ac97_component(component, WM9712_VENDOR_ID, @@ -660,7 +659,8 @@ static int wm9712_soc_probe(struct snd_soc_component *component) snd_soc_free_ac97_component(wm9712->ac97); return PTR_ERR(regmap); } -#endif + } else { + return -ENXIO; } snd_soc_component_init_regmap(component, regmap); @@ -673,14 +673,12 @@ static int wm9712_soc_probe(struct snd_soc_component *component) static void wm9712_soc_remove(struct snd_soc_component *component) { -#ifdef CONFIG_SND_SOC_AC97_BUS struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component); - if (!wm9712->mfd_pdata) { + if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS) && !wm9712->mfd_pdata) { snd_soc_component_exit_regmap(component); snd_soc_free_ac97_component(wm9712->ac97); } -#endif } static const struct snd_soc_component_driver soc_component_dev_wm9712 = { diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 643863bb32e0..b2bb465c8e5a 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1214,8 +1214,7 @@ static int wm9713_soc_probe(struct snd_soc_component *component) if (wm9713->mfd_pdata) { wm9713->ac97 = wm9713->mfd_pdata->ac97; regmap = wm9713->mfd_pdata->regmap; - } else { -#ifdef CONFIG_SND_SOC_AC97_BUS + } else if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) { wm9713->ac97 = snd_soc_new_ac97_component(component, WM9713_VENDOR_ID, WM9713_VENDOR_ID_MASK); if (IS_ERR(wm9713->ac97)) @@ -1225,7 +1224,8 @@ static int wm9713_soc_probe(struct snd_soc_component *component) snd_soc_free_ac97_component(wm9713->ac97); return PTR_ERR(regmap); } -#endif + } else { + return -ENXIO; } snd_soc_component_init_regmap(component, regmap); @@ -1238,14 +1238,12 @@ static int wm9713_soc_probe(struct snd_soc_component *component) static void wm9713_soc_remove(struct snd_soc_component *component) { -#ifdef CONFIG_SND_SOC_AC97_BUS struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component); - if (!wm9713->mfd_pdata) { + if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) { snd_soc_component_exit_regmap(component); snd_soc_free_ac97_component(wm9713->ac97); } -#endif } static const struct snd_soc_component_driver soc_component_dev_wm9713 = { -- 2.18.0

2 2

[alsa-devel] [PATCH v2 0/1] Introduce dmic mode switch delay parameter
by Jenny TC 02 Nov '18

02 Nov '18

Some DMICs need clock to be running for a specified duration as per the DMIC spec to complete the mode transition like sleep to normal, off to normal etc. v1: First patch set v2: 1). Removed ACPI device entry since a) The DMIC vendor doesn't have an ACPI vendor ID b) The ACPI enumeration creates one more device and conflicts with the existing skl.c dmic platform device registration. 2). Updated commit message Jenny TC (1): ASoC: dmic: Introduce mode switch delay sound/soc/codecs/dmic.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) -- 1.9.1

3 3

[alsa-devel] [PATCH alsa-utils] topology/topology.c: drop unneeded <dlfcn.h> include
by Thomas Petazzoni 02 Nov '18

02 Nov '18

This include is not used/needed and prevents building on systems that don't provide <dlfcn.h>. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- topology/topology.c | 1 - 1 file changed, 1 deletion(-) diff --git a/topology/topology.c b/topology/topology.c index 097c255..b72e341 100644 --- a/topology/topology.c +++ b/topology/topology.c @@ -27,7 +27,6 @@ #include <errno.h> #include <string.h> #include <sys/stat.h> -#include <dlfcn.h> #include <getopt.h> #include <assert.h> -- 2.14.4

2 1

[alsa-devel] [PATCH alsa-lib] utils/alsa.m4: conditionally enable libdl in AM_PATH_ALSA m4 macro
by Thomas Petazzoni 02 Nov '18

02 Nov '18

From: Thomas De Schampheleire <thomas.de.schampheleire(a)gmail.com> The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This breaks compilation of alsa-utils (and probably other packages using this macro) for targets that do not support dynamic loading. This patch updates the macro to check if dlopen is available, and use that result to conditionally add -ldl to the list of libraries. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire(a)gmail.com> Signed-off-by: Jörg Krause <joerg.krause(a)embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- utils/alsa.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/alsa.m4 b/utils/alsa.m4 index e12310df..a5c5a292 100644 --- a/utils/alsa.m4 +++ b/utils/alsa.m4 @@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then fi AC_MSG_RESULT($ALSA_CFLAGS) +AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) + dnl add any special lib dirs AC_MSG_CHECKING(for ALSA LDFLAGS) if test "$alsa_prefix" != "" ; then @@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then fi dnl add the alsa library -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" +ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" LIBS="$ALSA_LIBS $LIBS" AC_MSG_RESULT($ALSA_LIBS) -- 2.14.4

2 1

Re: [alsa-devel] [PATCH] ASoC: wm8996: fix small typo
by Charles Keepax 02 Nov '18

02 Nov '18

On Fri, Nov 02, 2018 at 09:30:06AM +0800, sh liu wrote: > >From e9b923690675ca8fa883fd25dcead5b457856735 Mon Sep 17 00:00:00 2001 > From: liush <liush(a)allwinnertech.com> > Date: Fri, 2 Nov 2018 08:57:00 +0800 > Subject: [PATCH] ASoC: wm8996: fix small typo > > atleast -> at least > > Change-Id: Icc970b438166daef13518b7d1a62b13eb8752f5f > Signed-off-by: liush <liush(a)allwinnertech.com> > --- Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Thanks, Charles

1 0

[alsa-devel] Bug report - Dell-WD15-Dock not working caused by ucm profile in alsa-lib 1.1.7
by René Santing 02 Nov '18

02 Nov '18

Hello Alsa developers, I would like to file a bug report about the Dell-WD15-Dock. This dock stopped working for me on archlinux/kde. The device was not picked up at all by pulse audio after some updates I installed last week. By trial and error I found out it was caused by the ucm profile that was added in alsa-lib 1.1.7. Running the following restored functionality. sudo mv /usr/share/alsa/ucm/Dell-WD15-Dock/Dell-WD15-Dock.conf /usr/share/alsa/ucm/Dell-WD15-Dock/Dell-WD15-Dock.bak pulseaudio -k I uploaded 3 alsa-info.sh profiles. 1.1.6 http://www.alsa-project.org/db/?f=a9a4c53d1e417c3d2ef304fe0778581c35b7a95e (working) 1.1.7 http://www.alsa-project.org/db/?f=bb474a687692e25f5e54c475f16f7ce4ef210f7a (not working) 1.1.7 http://www.alsa-project.org/db/?f=586dd059aaa08e839eb9df5f7b49990a5f4ad1a5 (working but moved the wd15 ucm profile) https://alsa-project.org/main/index.php/Bug_Tracking pointed me to this mailing list to submit this report. If this is the wrong place or there is more information need could you let me know so I can send it to the proper channels? Best regards, René Santing

2 9

[alsa-devel] [PATCH alsa-lib] Don't use fork() on noMMU platforms
by Thomas Petazzoni 02 Nov '18

02 Nov '18

fork() is not available on noMMU platforms, but in the specific case of pcm_direct.c, vfork() can be used instead. This commit adds an autoconf check for fork(), and falls back to vfork() is fork() is not available. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- configure.ac | 2 ++ src/pcm/pcm_direct.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4c9d860f..ab659490 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,8 @@ dnl Checks for library functions. AC_PROG_GCC_TRADITIONAL AC_CHECK_FUNCS([uselocale]) +AC_CHECK_FUNC([fork]) + SAVE_LIBRARY_VERSION AC_SUBST(LIBTOOL_VERSION_INFO) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 2b07eff9..4dc3ea26 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -431,13 +431,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) close(dmix->server_fd); return ret; } - + +#ifdef HAVE_FORK ret = fork(); +#else + ret = vfork(); +#endif if (ret < 0) { close(dmix->server_fd); return ret; } else if (ret == 0) { +#ifdef HAVE_FORK ret = fork(); +#else + ret = vfork(); +#endif if (ret == 0) server_job(dmix); _exit(EXIT_SUCCESS); -- 2.14.4

2 1

[alsa-devel] [PATCH 1/2] CHROMIUM: ASoC: rt5663: Add documentation for power supply support
by Cheng-Yi Chiang 02 Nov '18

02 Nov '18

rt5663 codec driver will support setting CPVDD and AVDD power supply from device tree. Signed-off-by: Cheng-Yi Chiang <cychiang(a)chromium.org> --- Documentation/devicetree/bindings/sound/rt5663.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rt5663.txt b/Documentation/devicetree/bindings/sound/rt5663.txt index 23386446c63d6..d4058dfde0392 100644 --- a/Documentation/devicetree/bindings/sound/rt5663.txt +++ b/Documentation/devicetree/bindings/sound/rt5663.txt @@ -36,6 +36,9 @@ Optional properties: "realtek,impedance_sensing_num" is 2. It means that there are 2 ranges of impedance in the impedance sensing function. +- avdd-supply: Power supply for AVDD, providing 1.8V. +- cpvdd-supply: Power supply for CPVDD, providing 3.5V. + Pins on the device (for linking into audio routes) for RT5663: * IN1P @@ -51,4 +54,6 @@ rt5663: codec@12 { compatible = "realtek,rt5663"; reg = <0x12>; interrupts = <7 IRQ_TYPE_EDGE_FALLING>; + avdd-supply = <&pp1800_a_alc5662>; + cpvdd-supply = <&pp3500_a_alc5662>; }; -- 2.19.1.568.g152ad8e336-goog

1 2

[alsa-devel] [PATCH] ASoC: wm8996: fix small typo
by lshua312 02 Nov '18

02 Nov '18

From e9b923690675ca8fa883fd25dcead5b457856735 Mon Sep 17 00:00:00 2001 From: liush <liush(a)allwinnertech.com> Date: Fri, 2 Nov 2018 08:57:00 +0800 Subject: [PATCH] ASoC: wm8996: fix small typo atleast -> at least Change-Id: Icc970b438166daef13518b7d1a62b13eb8752f5f Signed-off-by: liush <liush(a)allwinnertech.com> --- sound/soc/codecs/wm8996.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 8affa49..d039835 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2109,7 +2109,7 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source, if (i2c->irq) timeout *= 10; else - /* ensure timeout of atleast 1 jiffies */ + /* ensure timeout of at least 1 jiffies */ timeout = timeout/2 ? : 1; for (retry = 0; retry < 10; retry++) { -- 1.9.1

1 0