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

[PATCH] ASoC: samsung: i2s: Remove redundant null check before clk_disable_unprepare
by Xu Wang 05 Nov '20

05 Nov '20

Because clk_disable_unprepare() already checked NULL clock parameter, so the additional check is unnecessary, just remove it. Signed-off-by: Xu Wang <vulab(a)iscas.ac.cn> --- sound/soc/samsung/i2s.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index df53d4ea808f..36969f0a3f9a 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1212,8 +1212,7 @@ static int i2s_runtime_suspend(struct device *dev) priv->suspend_i2scon = readl(priv->addr + I2SCON); priv->suspend_i2spsr = readl(priv->addr + I2SPSR); - if (priv->op_clk) - clk_disable_unprepare(priv->op_clk); + clk_disable_unprepare(priv->op_clk); clk_disable_unprepare(priv->clk); return 0; -- 2.17.1

2 1

[PATCH] ASoC: pcm: DRAIN support reactivation
by Cezary Rojewski 05 Nov '20

05 Nov '20

soc-pcm's dpcm_fe_dai_do_trigger() supported DRAIN commnad up to kernel v5.4 where explicit switch(cmd) has been introduced which takes into account all SNDRV_PCM_TRIGGER_xxx but SNDRV_PCM_TRIGGER_DRAIN. Update switch statement to reactive support for it. As DRAIN is somewhat unique by lacking negative/stop counterpart, bring behaviour of dpcm_fe_dai_do_trigger() for said command back to its pre-v5.4 state by adding it to START/RESUME/PAUSE_RELEASE group. Fixes: acbf27746ecf ("ASoC: pcm: update FE/BE trigger order based on the command") Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index dcab9527ba3d..91bf33958159 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2231,6 +2231,7 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_DRAIN: ret = dpcm_dai_trigger_fe_be(substream, cmd, true); break; case SNDRV_PCM_TRIGGER_STOP: @@ -2248,6 +2249,7 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_DRAIN: ret = dpcm_dai_trigger_fe_be(substream, cmd, false); break; case SNDRV_PCM_TRIGGER_STOP: -- 2.17.1

3 2

[PATCH -next v2] ASoC: mediatek: mt8192: Make some symbols static
by Zou Wei 05 Nov '20

05 Nov '20

Fix the following sparse warnings: ./mt8192-dai-i2s.c:2040:5: warning: symbol 'mt8192_dai_i2s_get_share' was not declared. Should it be static? ./mt8192-dai-i2s.c:2060:5: warning: symbol 'mt8192_dai_i2s_set_priv' was not declared. Should it be static? ./mt8192-afe-gpio.c:15:16: warning: symbol 'aud_pinctrl' was not declared. Should it be static? ./mt8192-afe-pcm.c:70:5: warning: symbol 'mt8192_get_memif_pbuf_size' was not declared. Should it be static? ./mt8192-afe-pcm.c:2137:39: warning: symbol 'mt8192_afe_component' was not declared. Should it be static? Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Zou Wei <zou_wei(a)huawei.com> --- sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 2 +- sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 4 ++-- sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c index ea00088..4208820 100644 --- a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c +++ b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c @@ -12,7 +12,7 @@ #include "mt8192-afe-common.h" #include "mt8192-afe-gpio.h" -struct pinctrl *aud_pinctrl; +static struct pinctrl *aud_pinctrl; enum mt8192_afe_gpio { MT8192_AFE_GPIO_DAT_MISO_OFF, diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c index 4a4729f..e7fec2d 100644 --- a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c +++ b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c @@ -67,7 +67,7 @@ static int mt8192_irq_fs(struct snd_pcm_substream *substream, unsigned int rate) return mt8192_general_rate_transform(afe->dev, rate); } -int mt8192_get_memif_pbuf_size(struct snd_pcm_substream *substream) +static int mt8192_get_memif_pbuf_size(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -2134,7 +2134,7 @@ static int mt8192_afe_component_probe(struct snd_soc_component *component) return mtk_afe_add_sub_dai_control(component); } -const struct snd_soc_component_driver mt8192_afe_component = { +static const struct snd_soc_component_driver mt8192_afe_component = { .name = AFE_PCM_NAME, .probe = mt8192_afe_component_probe, .pointer = mtk_afe_pcm_pointer, diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c b/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c index 53c560e..5b29340 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c @@ -2037,7 +2037,7 @@ static const struct mtk_afe_i2s_priv mt8192_i2s_priv[DAI_I2S_NUM] = { }, }; -int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe) +static int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe) { struct mt8192_afe_private *afe_priv = afe->platform_priv; const struct device_node *of_node = afe->dev->of_node; @@ -2057,7 +2057,7 @@ int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe) return 0; } -int mt8192_dai_i2s_set_priv(struct mtk_base_afe *afe) +static int mt8192_dai_i2s_set_priv(struct mtk_base_afe *afe) { int i; int ret; -- 2.6.2

3 2

[PATCH] ASoC: mediatek: mt8192: Fix build failure
by Sudip Mukherjee 05 Nov '20

05 Nov '20

A build of arm64 allmodconfig with next-20201105 fails with the error: ERROR: modpost: "mt8192_afe_gpio_request" undefined! ERROR: modpost: "mt8192_afe_gpio_init" undefined! Export the symbols so that mt8192-mt6359-rt1015-rt5682.ko finds it. Signed-off-by: Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> --- build log at: https://travis-ci.com/github/sudipm-mukherjee/linux-test/jobs/428486008 sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c index ea000888c9e8..fbbe9ed9adb3 100644 --- a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c +++ b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c @@ -160,6 +160,7 @@ int mt8192_afe_gpio_init(struct device *dev) return 0; } +EXPORT_SYMBOL(mt8192_afe_gpio_init); static int mt8192_afe_gpio_adda_dl(struct device *dev, bool enable) { @@ -304,3 +305,4 @@ int mt8192_afe_gpio_request(struct device *dev, bool enable, return 0; } +EXPORT_SYMBOL(mt8192_afe_gpio_request); -- 2.11.0

2 1

[PATCH] ASoC: pxa: pxa-ssp: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare
by Xu Wang 05 Nov '20

05 Nov '20

ecause clk_prepare_enable() and clk_disable_unprepare() already checked NULL clock parameter, so the additional checks are unnecessary, just remove them. Signed-off-by: Xu Wang <vulab(a)iscas.ac.cn> --- sound/soc/pxa/pxa-ssp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index c4e7307a4437..b941adcbb8f9 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -99,8 +99,7 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream, pxa_ssp_disable(ssp); } - if (priv->extclk) - clk_prepare_enable(priv->extclk); + clk_prepare_enable(priv->extclk); dma = kzalloc(sizeof(struct snd_dmaengine_dai_dma_data), GFP_KERNEL); if (!dma) @@ -124,8 +123,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream, clk_disable_unprepare(ssp->clk); } - if (priv->extclk) - clk_disable_unprepare(priv->extclk); + clk_disable_unprepare(priv->extclk); kfree(snd_soc_dai_get_dma_data(cpu_dai, substream)); snd_soc_dai_set_dma_data(cpu_dai, substream, NULL); -- 2.17.1

2 1

[PATCH -next] ASoC: mediatek: mt8192: Make some symbols static
by Zou Wei 05 Nov '20

05 Nov '20

Fix the following sparse warnings: ./mt8192-dai-i2s.c:2040:5: warning: symbol 'mt8192_dai_i2s_get_share' was not declared. Should it be static? ./mt8192-dai-i2s.c:2060:5: warning: symbol 'mt8192_dai_i2s_set_priv' was not declared. Should it be static? Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Zou Wei <zou_wei(a)huawei.com> --- sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c b/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c index 53c560e..5b29340 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c @@ -2037,7 +2037,7 @@ static const struct mtk_afe_i2s_priv mt8192_i2s_priv[DAI_I2S_NUM] = { }, }; -int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe) +static int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe) { struct mt8192_afe_private *afe_priv = afe->platform_priv; const struct device_node *of_node = afe->dev->of_node; @@ -2057,7 +2057,7 @@ int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe) return 0; } -int mt8192_dai_i2s_set_priv(struct mtk_base_afe *afe) +static int mt8192_dai_i2s_set_priv(struct mtk_base_afe *afe) { int i; int ret; -- 2.6.2

1 0

[PATCH] sound: soc: mediatek: mt8192: fix modpost ERROR
by Anders Roxell 05 Nov '20

05 Nov '20

When enabling CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=m the following error shows up: ERROR: modpost: "mt8192_afe_gpio_request" [sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.ko] undefined! ERROR: modpost: "mt8192_afe_gpio_init" [sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.ko] undefined! Fix the link error by export the symbols mt8192_afe_gpio_init and mt8192_afe_gpio_request. Fixes: 18b13ff23fab ("ASoC: mediatek: mt8192: add machine driver with mt6359, rt1015 and rt5682") Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c index ea000888c9e8..0286c95ed2b8 100644 --- a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c +++ b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c @@ -160,6 +160,7 @@ int mt8192_afe_gpio_init(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(mt8192_afe_gpio_init); static int mt8192_afe_gpio_adda_dl(struct device *dev, bool enable) { @@ -304,3 +305,4 @@ int mt8192_afe_gpio_request(struct device *dev, bool enable, return 0; } +EXPORT_SYMBOL_GPL(mt8192_afe_gpio_request); -- 2.28.0

1 0

[PATCH 0/8] slab: provide and use krealloc_array()
by Bartosz Golaszewski 05 Nov '20

05 Nov '20

From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> Andy brought to my attention the fact that users allocating an array of equally sized elements should check if the size multiplication doesn't overflow. This is why we have helpers like kmalloc_array(). However we don't have krealloc_array() equivalent and there are many users who do their own multiplication when calling krealloc() for arrays. This series provides krealloc_array() and uses it in a couple places. A separate series will follow adding devm_krealloc_array() which is needed in the xilinx adc driver. Bartosz Golaszewski (8): mm: slab: provide krealloc_array() ALSA: pcm: use krealloc_array() vhost: vringh: use krealloc_array() pinctrl: use krealloc_array() edac: ghes: use krealloc_array() drm: atomic: use krealloc_array() hwtracing: intel: use krealloc_array() dma-buf: use krealloc_array() drivers/dma-buf/sync_file.c | 4 ++-- drivers/edac/ghes_edac.c | 4 ++-- drivers/gpu/drm/drm_atomic.c | 3 ++- drivers/hwtracing/intel_th/msu.c | 2 +- drivers/pinctrl/pinctrl-utils.c | 2 +- drivers/vhost/vringh.c | 3 ++- include/linux/slab.h | 11 +++++++++++ sound/core/pcm_lib.c | 4 ++-- 8 files changed, 23 insertions(+), 10 deletions(-) -- 2.29.1

11 20

[PATCH] ALSA: usb-audio: Add implicit feedback quirk for Qu-16
by Geoffrey D. Bennett 05 Nov '20

05 Nov '20

This patch fixes audio distortion on playback for the Allen&Heath Qu-16. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- pcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index b401ee8..c4915de 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -336,6 +336,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, switch (subs->stream->chip->usb_id) { case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */ case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */ + case USB_ID(0x22f0, 0x0006): /* Allen&Heath Qu-16 */ ep = 0x81; ifnum = 3; goto add_sync_ep_from_ifnum;

2 1

[PATCH] ALSA: usb-audio: Add implicit feedback quirk for MODX
by Geoffrey D. Bennett 05 Nov '20

05 Nov '20

This patch fixes audio distortion on playback for the Yamaha MODX. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> Tested-by: Frank Slotta <frank.slotta(a)posteo.de> --- pcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index b401ee894e1b..22fbd1f48b3e 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -345,6 +345,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, ifnum = 2; goto add_sync_ep_from_ifnum; case USB_ID(0x2466, 0x8003): /* Fractal Audio Axe-Fx II */ + case USB_ID(0x0499, 0x172a): /* Yamaha MODX */ ep = 0x86; ifnum = 2; goto add_sync_ep_from_ifnum;

2 3