February 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: topology: free created components in tplg load error
by Bard liao 19 Feb '19

19 Feb '19

Topology resources are no longer needed if any element failed to load. Signed-off-by: Bard liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/soc-topology.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index c5638e15a2dd..25fca7055464 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2587,6 +2587,7 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, struct snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id) { struct soc_tplg tplg; + int ret; /* setup parsing context */ memset(&tplg, 0, sizeof(tplg)); @@ -2600,7 +2601,12 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, tplg.bytes_ext_ops = ops->bytes_ext_ops; tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count; - return soc_tplg_load(&tplg); + ret = soc_tplg_load(&tplg); + /* free the created components if fail to load topology */ + if (ret) + snd_soc_tplg_component_remove(comp, SND_SOC_TPLG_INDEX_ALL); + + return ret; } EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load); -- 2.17.1

3 3

[alsa-devel] [GIT PULL] ASoC fixes for v5.0
by Mark Brown 19 Feb '19

19 Feb '19

The following changes since commit 860b454c2c0cbda6892954f5cdbbb48931b3c8db: ASoC: samsung: Prevent clk_get_rate() calls in atomic context (2019-02-07 14:34:53 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.0-rc6 for you to fetch changes up to 19dd0777773ab17b4d97f7105e836867c0cdecb4: ASoC: simple-card: fixup refcount_t underflow (2019-02-18 18:36:52 +0000) ---------------------------------------------------------------- ASoC: Fixes for v5.0 A few small fixes, a driver fix for Samsung, a fix for refcounting of of_nodes in the simple-card driver that triggered on a lot of systems and a fix for topology error handling. ---------------------------------------------------------------- Bard liao (1): ASoC: topology: free created components in tplg load error Kuninori Morimoto (1): ASoC: simple-card: fixup refcount_t underflow Sylwester Nawrocki (1): ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI sound/soc/generic/simple-card.c | 2 +- sound/soc/samsung/i2s.c | 8 +++++++- sound/soc/soc-topology.c | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-)

2 1

[alsa-devel] [bug report] ASoC: dapm: Consolidate input and output path handling
by Dan Carpenter 19 Feb '19

19 Feb '19

Hello Lars-Peter Clausen, The patch a3423b02cf74: "ASoC: dapm: Consolidate input and output path handling" from Aug 11, 2015, leads to the following static checker warning: sound/soc/soc-dapm.c:2831 snd_soc_dapm_add_path() error: potential zalloc NULL dereference: 'path->sink' sound/soc/soc-dapm.c 2791 2792 path = kzalloc(sizeof(struct snd_soc_dapm_path), GFP_KERNEL); 2793 if (!path) 2794 return -ENOMEM; 2795 2796 path->node[SND_SOC_DAPM_DIR_IN] = wsource; 2797 path->node[SND_SOC_DAPM_DIR_OUT] = wsink; We used to say "path->sink = wsink;" here, but now it's NULL from the kzalloc(). 2798 widgets[SND_SOC_DAPM_DIR_IN] = wsource; 2799 widgets[SND_SOC_DAPM_DIR_OUT] = wsink; 2800 2801 path->connected = connected; 2802 INIT_LIST_HEAD(&path->list); 2803 INIT_LIST_HEAD(&path->list_kcontrol); 2804 2805 if (wsource->is_supply || wsink->is_supply) 2806 path->is_supply = 1; 2807 2808 /* connect static paths */ 2809 if (control == NULL) { 2810 path->connect = 1; 2811 } else { 2812 switch (wsource->id) { 2813 case snd_soc_dapm_demux: 2814 ret = dapm_connect_mux(dapm, path, control, wsource); 2815 if (ret) 2816 goto err; 2817 break; 2818 default: 2819 break; 2820 } 2821 2822 switch (wsink->id) { 2823 case snd_soc_dapm_mux: 2824 ret = dapm_connect_mux(dapm, path, control, wsink); 2825 if (ret != 0) 2826 goto err; 2827 break; 2828 case snd_soc_dapm_switch: 2829 case snd_soc_dapm_mixer: 2830 case snd_soc_dapm_mixer_named_ctl: --> 2831 ret = dapm_connect_mixer(dapm, path, control); ^^^^ Dereferenced inside the function. It's hard to believe that this has been broken for three years, but I can't see another explanation. (0)_(0)!!! 2832 if (ret != 0) 2833 goto err; 2834 break; 2835 default: 2836 break; 2837 } 2838 } 2839 2840 list_add(&path->list, &dapm->card->paths); 2841 snd_soc_dapm_for_each_direction(dir) regards, dan carpenter

1 0

[alsa-devel] [PATCH 1/3] SoC: imx-sgtl5000: add missing put_device()
by Wen Yang 19 Feb '19

19 Feb '19

The of_find_device_by_node() takes a reference to the underlying device structure, we should release that reference. Detected by coccinelle with the following warnings: ./sound/soc/fsl/imx-sgtl5000.c:169:1-7: ERROR: missing put_device; call of_find_device_by_node on line 105, but without a corresponding object release within this function. ./sound/soc/fsl/imx-sgtl5000.c:177:1-7: ERROR: missing put_device; call of_find_device_by_node on line 105, but without a corresponding object release within this function. Signed-off-by: Wen Yang <yellowriver2010(a)hotmail.com> Cc: Timur Tabi <timur(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Shawn Guo <shawnguo(a)kernel.org> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Pengutronix Kernel Team <kernel(a)pengutronix.de> Cc: NXP Linux Team <linux-imx(a)nxp.com> Cc: alsa-devel(a)alsa-project.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-kernel(a)vger.kernel.org --- sound/soc/fsl/imx-sgtl5000.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index b6cb80480b60..bf8597f57dce 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -108,6 +108,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) ret = -EPROBE_DEFER; goto fail; } + put_device(&ssi_pdev->dev); codec_dev = of_find_i2c_device_by_node(codec_np); if (!codec_dev) { dev_dbg(&pdev->dev, "failed to find codec platform device\n"); -- 2.20.1

2 1

[alsa-devel] Applied "ASoC: adau1977: Fix reset-gpios typo" to the asoc tree
by Mark Brown 19 Feb '19

19 Feb '19

The patch ASoC: adau1977: Fix reset-gpios typo has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From d98afe1353b6dbd1527f3833da70d8525e6dbae3 Mon Sep 17 00:00:00 2001 From: Bogdan Togorean <bogdan.togorean(a)analog.com> Date: Fri, 15 Feb 2019 12:26:33 +0200 Subject: [PATCH] ASoC: adau1977: Fix reset-gpios typo This change fixes a typo in the dt-binding examples (reset_gpio -> reset-gpios). Even though 'reset-gpio' is a valid construct for gpiolib the naming 'reset-gpios' is more suited for dt-bindings documentation. Signed-off-by: Bogdan Togorean <bogdan.togorean(a)analog.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Documentation/devicetree/bindings/sound/adi,adau1977.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/adi,adau1977.txt b/Documentation/devicetree/bindings/sound/adi,adau1977.txt index e79aeef73f28..11acd94b1665 100644 --- a/Documentation/devicetree/bindings/sound/adi,adau1977.txt +++ b/Documentation/devicetree/bindings/sound/adi,adau1977.txt @@ -17,7 +17,7 @@ Required properties: Documentation/devicetree/bindings/regulator/regulator.txt Optional properties: - - reset-gpio: the reset pin for the chip, for more details consult + - reset-gpios: the reset pin for the chip, for more details consult Documentation/devicetree/bindings/gpio/gpio.txt - DVDD-supply: supply voltage for the digital core, please consult @@ -40,7 +40,7 @@ Examples: AVDD-supply = <&regulator>; DVDD-supply = <&regulator_digital>; - reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; adau1977_i2c: adau1977@11 { @@ -50,5 +50,5 @@ Examples: AVDD-supply = <&regulator>; DVDD-supply = <&regulator_digital>; - reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; -- 2.20.1

1 0

[alsa-devel] Applied "ASoC: fsl_esai: fix register setting issue in RIGHT_J mode" to the asoc tree
by Mark Brown 19 Feb '19

19 Feb '19

The patch ASoC: fsl_esai: fix register setting issue in RIGHT_J mode has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From cc29ea007347f39f4c5a4d27b0b555955a0277f9 Mon Sep 17 00:00:00 2001 From: "S.j. Wang" <shengjiu.wang(a)nxp.com> Date: Mon, 18 Feb 2019 08:29:11 +0000 Subject: [PATCH] ASoC: fsl_esai: fix register setting issue in RIGHT_J mode The ESAI_xCR_xWA is xCR's bit, not the xCCR's bit, driver set it to wrong register, correct it. Fixes 43d24e76b698 ("ASoC: fsl_esai: Add ESAI CPU DAI driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Ackedy-by: Nicolin Chen <nicoleotsuka(a)gmail.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/fsl/fsl_esai.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 57b484768a58..afe67c865330 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -398,7 +398,8 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; case SND_SOC_DAIFMT_RIGHT_J: /* Data on rising edge of bclk, frame high, right aligned */ - xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCR_xWA; + xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP; + xcr |= ESAI_xCR_xWA; break; case SND_SOC_DAIFMT_DSP_A: /* Data on rising edge of bclk, frame high, 1clk before data */ @@ -455,12 +456,12 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR; + mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR | ESAI_xCR_xWA; regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, mask, xcr); regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, mask, xcr); mask = ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCCR_xFSP | - ESAI_xCCR_xFSD | ESAI_xCCR_xCKD | ESAI_xCR_xWA; + ESAI_xCCR_xFSD | ESAI_xCCR_xCKD; regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR, mask, xccr); regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, mask, xccr); -- 2.20.1

1 0

[alsa-devel] Applied "ASoC: wm8741: Make function 'wm8741_mute' static" to the asoc tree
by Mark Brown 19 Feb '19

19 Feb '19

The patch ASoC: wm8741: Make function 'wm8741_mute' static has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 76a60f312f64dc48450b15a7f167b46e6230e4d1 Mon Sep 17 00:00:00 2001 From: Wei Yongjun <weiyongjun1(a)huawei.com> Date: Sat, 16 Feb 2019 01:35:56 +0000 Subject: [PATCH] ASoC: wm8741: Make function 'wm8741_mute' static Fixes the following sparse warning: sound/soc/codecs/wm8741.c:371:5: warning: symbol 'wm8741_mute' was not declared. Should it be static? Fixes: 36b1599340b5 ("ASoC: wm8741: Add digital mute callback") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/wm8741.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index a4b8c459ea57..546ea735f534 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -368,7 +368,7 @@ static int wm8741_set_dai_fmt(struct snd_soc_dai *codec_dai, return 0; } -int wm8741_mute(struct snd_soc_dai *codec_dai, int mute) +static int wm8741_mute(struct snd_soc_dai *codec_dai, int mute) { struct snd_soc_component *component = codec_dai->component; -- 2.20.1

1 0

[alsa-devel] Applied "ASoC: samsung: odroid: Add missing DAPM routes" to the asoc tree
by Mark Brown 19 Feb '19

19 Feb '19

The patch ASoC: samsung: odroid: Add missing DAPM routes has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f89aea0f132142b29dc0c8cf4d445bd12db7b1a6 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Date: Fri, 15 Feb 2019 13:04:22 +0100 Subject: [PATCH] ASoC: samsung: odroid: Add missing DAPM routes With old DTS there will be missing DAPM routes linking BE with CODECs. Add those routes in the card driver so sound works properly on Odroid XU3/4 also without DTS updates enabling the secondary PCM. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/samsung/odroid.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 941e8c3f67a4..5b2bcd1d3450 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -149,6 +149,12 @@ static const struct snd_soc_ops odroid_card_be_ops = { .trigger = odroid_card_be_trigger, }; +/* DAPM routes for backward compatibility with old DTS */ +static const struct snd_soc_dapm_route odroid_dapm_routes[] = { + { "I2S Playback", NULL, "Mixer DAI TX" }, + { "HiFi Playback", NULL, "Mixer DAI TX" }, +}; + static struct snd_soc_dai_link odroid_card_dais[] = { { /* Primary FE <-> BE link */ @@ -237,11 +243,15 @@ static int odroid_audio_probe(struct platform_device *pdev) /* * For backwards compatibility create the secondary CPU DAI link only * if there are 2 CPU DAI entries in the cpu sound-dai property in DT. + * Also add required DAPM routes not available in old DTS. */ num_pcms = of_count_phandle_with_args(cpu, "sound-dai", "#sound-dai-cells"); - if (num_pcms == 1) + if (num_pcms == 1) { + card->dapm_routes = odroid_dapm_routes; + card->num_dapm_routes = ARRAY_SIZE(odroid_dapm_routes); card->num_links--; + } for (i = 0; i < num_pcms; i++, link += 2) { ret = of_parse_phandle_with_args(cpu, "sound-dai", -- 2.20.1

1 0

Re: [alsa-devel] [PATCH] dt-bindings: adau1977: Fix reset-gpios typo
by Mark Brown 19 Feb '19

19 Feb '19

On Fri, Feb 15, 2019 at 12:26:33PM +0200, Bogdan Togorean wrote: > This change fixes a typo in the dt-binding examples (reset_gpio -> > reset-gpios). > Even though 'reset-gpio' is a valid construct for gpiolib the naming > 'reset-gpios' is more suited for dt-bindings documentation. Please use subject lines matching the style for the subsystem. This makes it easier for people to identify relevant patches.

1 0

[alsa-devel] Can't load alsa-project.org
by 積丹尼 Dan Jacobson 19 Feb '19

19 Feb '19

Dear ALSA team, you need to update the TLS on alsa-project.org > That's because the site apparently only offers TLS 1.0 which libssl > does not support anymore by default. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921523 P.S., The side panel of https://alsa-project.org/ has a link to "Bug tracking" which is broken and needs to link to https://alsa-project.org/main/index.php/Bug_Tracking instead.

2 1