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

[alsa-devel] [PATCH 0/3] ASoC: mediatek: mt6358: fix mixer control issues
by Tzung-Bi Shih 08 May '19

08 May '19

This series fixes the following mixer control related issues: - "Headphone Volume" and "PGA Volume" have been reset after previous stream closed. - Set "Headphone Volume" to the smallest value (-10dB) still get mute, because ramp from -10dB to -10dB is a NOP in original implementation. "Lineout Volume" and "Handset Volume" are un-tested. Fixing them by applying similar logic with "Headphone Volume". Tzung-Bi Shih (3): ASoC: mediatek: mt6358: initialize setting when ramping volume ASoC: mediatek: mt6358: save output volume for mixer controls ASoC: mediatek: mt6358: save PGA for mixer control sound/soc/codecs/mt6358.c | 131 ++++++++++++++++++++++++-------------- 1 file changed, 83 insertions(+), 48 deletions(-) -- 2.21.0.1020.gf2820cf01a-goog

2 6

[alsa-devel] [PATCH] ASoC: codec: hdac_hdmi: no checking monitor in hw_params
by libin.yang＠intel.com 08 May '19

08 May '19

From: Libin Yang <libin.yang(a)intel.com> Some userspace apps, like pulseaudio, may call open, hw_params, prepare to judge whether the pcm is ready or not. Current hdac_hdmi will return -ENODEV if monitor is not connected, which will cause the apps believe the pcm is not ready. Actually PCM for hdmi is ready, even the monitor is not connected. This patch removes the check of monitor presence in hw_params, just like what the legacy HD-Audio driver does. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 4de1fbf..660e058 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -455,24 +455,11 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hparams, struct snd_soc_dai *dai) { struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai); - struct hdac_device *hdev = hdmi->hdev; struct hdac_hdmi_dai_port_map *dai_map; - struct hdac_hdmi_port *port; struct hdac_hdmi_pcm *pcm; int format; dai_map = &hdmi->dai_map[dai->id]; - port = dai_map->port; - - if (!port) - return -ENODEV; - - if ((!port->eld.monitor_present) || (!port->eld.eld_valid)) { - dev_err(&hdev->dev, - "device is not configured for this pin:port%d:%d\n", - port->pin->nid, port->id); - return -ENODEV; - } format = snd_hdac_calc_stream_format(params_rate(hparams), params_channels(hparams), params_format(hparams), -- 2.7.4

4 3

[alsa-devel] [PATCH 0/2] ASoC: stm32: i2s: add some features
by Olivier Moysan 08 May '19

08 May '19

Update and add some features in STM32 I2S driver. - update pcm hardware constraints - add management of identification registers Olivier Moysan (2): ASoC: stm32: i2s: update pcm hardware constraints ASoC: stm32: i2s: manage identification registers sound/soc/stm/stm32_i2s.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 4 deletions(-) -- 2.7.4

2 4

[alsa-devel] [RESEND PATCH v3] ASoC: fsl_sai: Move clock operation to PM runtime
by Daniel Baluta 08 May '19

08 May '19

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> Turn off/on clocks when device enters suspend/resume. This can help saving power. As a further optimization, we turn off/on mclk only when SAI is in master mode because otherwise mclk is externally provided. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> Reviewed-by: Viorel Suman <viorel.suman(a)nxp.com> --- - initially part of this 3 patch series https://patchwork.kernel.org/cover/10911519/ - first 2 patches were merged sound/soc/fsl/fsl_sai.c | 54 +++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 8593269156bd..d58cc3ae90d8 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -596,15 +596,8 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream, { struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; - struct device *dev = &sai->pdev->dev; int ret; - ret = clk_prepare_enable(sai->bus_clk); - if (ret) { - dev_err(dev, "failed to enable bus clock: %d\n", ret); - return ret; - } - regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, FSL_SAI_CR3_TRCE); @@ -621,8 +614,6 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream, bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0); - - clk_disable_unprepare(sai->bus_clk); } static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = { @@ -935,6 +926,14 @@ static int fsl_sai_runtime_suspend(struct device *dev) { struct fsl_sai *sai = dev_get_drvdata(dev); + if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE)) + clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[0]]); + + if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_PLAYBACK)) + clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[1]]); + + clk_disable_unprepare(sai->bus_clk); + regcache_cache_only(sai->regmap, true); regcache_mark_dirty(sai->regmap); @@ -944,6 +943,25 @@ static int fsl_sai_runtime_suspend(struct device *dev) static int fsl_sai_runtime_resume(struct device *dev) { struct fsl_sai *sai = dev_get_drvdata(dev); + int ret; + + ret = clk_prepare_enable(sai->bus_clk); + if (ret) { + dev_err(dev, "failed to enable bus clock: %d\n", ret); + return ret; + } + + if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_PLAYBACK)) { + ret = clk_prepare_enable(sai->mclk_clk[sai->mclk_id[1]]); + if (ret) + goto disable_bus_clk; + } + + if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE)) { + ret = clk_prepare_enable(sai->mclk_clk[sai->mclk_id[0]]); + if (ret) + goto disable_tx_clk; + } regcache_cache_only(sai->regmap, false); regmap_write(sai->regmap, FSL_SAI_TCSR, FSL_SAI_CSR_SR); @@ -951,7 +969,23 @@ static int fsl_sai_runtime_resume(struct device *dev) usleep_range(1000, 2000); regmap_write(sai->regmap, FSL_SAI_TCSR, 0); regmap_write(sai->regmap, FSL_SAI_RCSR, 0); - return regcache_sync(sai->regmap); + + ret = regcache_sync(sai->regmap); + if (ret) + goto disable_rx_clk; + + return 0; + +disable_rx_clk: + if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE)) + clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[0]]); +disable_tx_clk: + if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_PLAYBACK)) + clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[1]]); +disable_bus_clk: + clk_disable_unprepare(sai->bus_clk); + + return ret; } #endif /* CONFIG_PM */ -- 2.17.1

3 2

[alsa-devel] Applied "sound: soc-acpi: fix implicit header use of module.h/export.h" to the asoc tree
by Mark Brown 08 May '19

08 May '19

The patch sound: soc-acpi: fix implicit header use of module.h/export.h has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3 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 473849e7f208b2d7de004c6c6c0eabe037d125ac Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker(a)windriver.com> Date: Sat, 13 Apr 2019 11:15:18 -0400 Subject: [PATCH] sound: soc-acpi: fix implicit header use of module.h/export.h This file is implicitly relying on an instance of including module.h from <linux/acpi.h>. Ideally, header files under include/linux shouldn't be adding includes of other headers, in anticipation of their consumers, but just the headers needed for the header itself to pass parsing with CPP. The module.h is particularly bad in this sense, as it itself does include a whole bunch of other headers, due to the complexity of module support. Here, we make the include explicit, in order to allow the future removal of module.h from linux/acpi.h without causing build breakage. 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> Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-acpi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index 4fb29f0e561e..444ce0602f76 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -4,6 +4,8 @@ // // Copyright (c) 2013-15, Intel Corporation. +#include <linux/export.h> +#include <linux/module.h> #include <sound/soc-acpi.h> struct snd_soc_acpi_mach * -- 2.20.1

1 0

[alsa-devel] Support low power consumption for ALC3204
by Kailang 08 May '19

08 May '19

Hi Takashi, This patch will support low consumption for Chrome ALC3204. Thanks. BR, Kailang

2 1

[alsa-devel] [GIT PULL] ASoC fixes for v5.2
by Mark Brown 08 May '19

08 May '19

The following changes since commit 1587a061ef562de0d97c82a95863e191bcd69d63: ASoC: sprd: Add reserved DMA memory support (2019-05-06 22:48:03 +0900) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.2-2 for you to fetch changes up to ce38a75089f70f6380fc63a5478a7659b4eb3f47: ASoC: SOF: core: fix undefined nocodec reference (2019-05-08 15:42:00 +0900) ---------------------------------------------------------------- ASoC: Fixes for v5.2 A bunch of driver specific fixes that came in since the initial pull request for v5.2, mainly warning fixes for the newly added Sound Open Firmware code which people appeared to only start looking at after I'd sent the pull request. ---------------------------------------------------------------- Curtis Malainey (1): ASoC: RT5677-SPI: Disable 16Bit SPI Transfers Jon Hunter (1): ASoC: max98090: Fix restore of DAPM Muxes Olivier Moysan (2): ASoC: stm32: spdifrx: update pcm hardware constraints ASoC: stm32: spdifrx: change trace level on iec control Pierre-Louis Bossart (2): ASoC: SOF: xtensa: fix undefined references ASoC: SOF: core: fix undefined nocodec reference Randy Dunlap (1): ASoC: sound/soc/sof/: fix kconfig dependency warning Takashi Iwai (4): ASoC: da7219: Fix a compile warning at CONFIG_COMMON_CLK=n ASoC: SOF: Fix a compile warning with CONFIG_PCI=n ASoC: rockchip: Fix an uninitialized variable compile warning ASoC: SOF: Propagate sof_get_ctrl_copy_params() error properly sound/soc/codecs/da7219.c | 2 ++ sound/soc/codecs/max98090.c | 12 ++++++------ sound/soc/codecs/rt5677-spi.c | 35 ++++++++++++++++------------------- sound/soc/rockchip/rockchip_pdm.c | 2 +- sound/soc/sof/Kconfig | 2 +- sound/soc/sof/core.c | 10 +++++----- sound/soc/sof/intel/Kconfig | 2 +- sound/soc/sof/ipc.c | 10 +++++++--- sound/soc/sof/ops.c | 2 +- sound/soc/stm/stm32_spdifrx.c | 5 +++-- 10 files changed, 43 insertions(+), 39 deletions(-)

2 1

[alsa-devel] [PATCH] ASoC: cs42xx8: Add reset gpio handling
by S.j. Wang 08 May '19

08 May '19

Handle the reset GPIO and reset the device in pm_runtime_resume Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/codecs/cs42xx8.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index ebb9e0cf8364..fc28e6d26c6d 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/module.h> #include <linux/of_device.h> +#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <sound/pcm_params.h> @@ -45,6 +46,7 @@ struct cs42xx8_priv { bool slave_mode; unsigned long sysclk; u32 tx_channels; + int gpio_reset; }; /* -127.5dB to 0dB with step of 0.5dB */ @@ -467,6 +469,17 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap) return -EINVAL; } + cs42xx8->gpio_reset = of_get_named_gpio(dev->of_node, "gpio-reset", 0); + if (gpio_is_valid(cs42xx8->gpio_reset)) { + ret = devm_gpio_request_one(dev, cs42xx8->gpio_reset, + GPIOF_OUT_INIT_LOW, "cs42xx8 reset"); + if (ret) { + dev_err(dev, "unable to get reset gpio\n"); + return ret; + } + gpio_set_value_cansleep(cs42xx8->gpio_reset, 1); + } + cs42xx8->clk = devm_clk_get(dev, "mclk"); if (IS_ERR(cs42xx8->clk)) { dev_err(dev, "failed to get the clock: %ld\n", @@ -547,6 +560,11 @@ static int cs42xx8_runtime_resume(struct device *dev) return ret; } + if (gpio_is_valid(cs42xx8->gpio_reset)) { + gpio_set_value_cansleep(cs42xx8->gpio_reset, 0); + gpio_set_value_cansleep(cs42xx8->gpio_reset, 1); + } + ret = regulator_bulk_enable(ARRAY_SIZE(cs42xx8->supplies), cs42xx8->supplies); if (ret) { @@ -559,6 +577,7 @@ static int cs42xx8_runtime_resume(struct device *dev) regcache_cache_only(cs42xx8->regmap, false); + regcache_mark_dirty(cs42xx8->regmap); ret = regcache_sync(cs42xx8->regmap); if (ret) { dev_err(dev, "failed to sync regmap: %d\n", ret); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: SOF: Propagate sof_get_ctrl_copy_params() error properly
by Takashi Iwai 08 May '19

08 May '19

This fixes a compile warning below by properly handling the error code from sof_get_ctrl_copy_params(): include/linux/kernel.h:843:43: warning: 'sparams.pl_size' may be used uninitialized in this function [-Wmaybe-uninitialized] sound/soc/sof/ipc.c:639:34: note: 'sparams.pl_size' was declared here The function returns an error before setting sparams.pl_size, so it'd assign an uninitialized value at a later point. Fixes: 53e0c72d98ba ("ASoC: SOF: Add support for IPC IO between DSP and Host") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/sof/ipc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c index ba1bb17a8d1e..f0b9d3c53f6f 100644 --- a/sound/soc/sof/ipc.c +++ b/sound/soc/sof/ipc.c @@ -567,7 +567,7 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, size_t offset = 0; size_t msg_bytes; size_t pl_size; - int err = 0; + int err; int i; /* allocate max ipc size because we have at least one */ @@ -576,9 +576,13 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, return -ENOMEM; if (send) - sof_get_ctrl_copy_params(cdata->type, cdata, partdata, sparams); + err = sof_get_ctrl_copy_params(cdata->type, cdata, partdata, + sparams); else - sof_get_ctrl_copy_params(cdata->type, partdata, cdata, sparams); + err = sof_get_ctrl_copy_params(cdata->type, partdata, cdata, + sparams); + if (err < 0) + return err; msg_bytes = sparams->msg_bytes; pl_size = sparams->pl_size; -- 2.16.4

3 3

[alsa-devel] [PATCH] ASoC: rt5677: Add component driver name
by Curtis Malainey 08 May '19

08 May '19

Add name to component driver so it is possible to lookup the component when needed. Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- sound/soc/codecs/rt5677.c | 7 ++++--- sound/soc/codecs/rt5677.h | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 6fc70e441458..44071c7a4670 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -4650,7 +4650,7 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset) } static const struct gpio_chip rt5677_template_chip = { - .label = "rt5677", + .label = RT5677_DRV_NAME, .owner = THIS_MODULE, .direction_output = rt5677_gpio_direction_out, .set = rt5677_gpio_set, @@ -4958,6 +4958,7 @@ static struct snd_soc_dai_driver rt5677_dai[] = { }; static const struct snd_soc_component_driver soc_component_dev_rt5677 = { + .name = RT5677_DRV_NAME, .probe = rt5677_probe, .remove = rt5677_remove, .suspend = rt5677_suspend, @@ -5079,7 +5080,7 @@ static struct regmap_irq rt5677_irqs[] = { }; static struct regmap_irq_chip rt5677_irq_chip = { - .name = "rt5677", + .name = RT5677_DRV_NAME, .irqs = rt5677_irqs, .num_irqs = ARRAY_SIZE(rt5677_irqs), @@ -5267,7 +5268,7 @@ static int rt5677_i2c_remove(struct i2c_client *i2c) static struct i2c_driver rt5677_i2c_driver = { .driver = { - .name = "rt5677", + .name = RT5677_DRV_NAME, .of_match_table = rt5677_of_match, .acpi_match_table = ACPI_PTR(rt5677_acpi_match), }, diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h index 183d92b03045..11a2ffceec3b 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -1674,6 +1674,8 @@ #define RT5677_FIRMWARE1 "rt5677_dsp_fw1.bin" #define RT5677_FIRMWARE2 "rt5677_dsp_fw2.bin" +#define RT5677_DRV_NAME "rt5677" + /* System Clock Source */ enum { RT5677_SCLK_S_MCLK, -- 2.21.0.1020.gf2820cf01a-goog

2 2