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

[alsa-devel] [PATCH] sound: aedsp16: Change structure initialisation to C99 style
by Amitoj Kaur Chawla 15 Jun '16

15 Jun '16

Replace the in order struct initialisation style with explicit field style. The Coccinelle semantic patch used to make this change is as follows: @decl@ identifier i1,fld; type T; field list[n] fs; @@ struct i1 { fs T fld; ...}; @@ identifier decl.i1,i2,decl.fld; expression e; position bad.p, bad.fix; @@ struct i1 i2@p = { ..., + .fld = e - e@fix ,...}; Signed-off-by: Amitoj Kaur Chawla <amitoj1606(a)gmail.com> --- sound/oss/aedsp16.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c index 35b5912..bb477d5 100644 --- a/sound/oss/aedsp16.c +++ b/sound/oss/aedsp16.c @@ -482,13 +482,13 @@ static struct orVals orDMA[] __initdata = { }; static struct aedsp16_info ae_config = { - DEF_AEDSP16_IOB, - DEF_AEDSP16_IRQ, - DEF_AEDSP16_MRQ, - DEF_AEDSP16_DMA, - -1, - -1, - INIT_NONE + .base_io = DEF_AEDSP16_IOB, + .irq = DEF_AEDSP16_IRQ, + .mpu_irq = DEF_AEDSP16_MRQ, + .dma = DEF_AEDSP16_DMA, + .mss_base = -1, + .mpu_base = -1, + .init = INIT_NONE }; /* -- 1.9.1

2 1

[alsa-devel] [PATCH v2 1/2] sound: lpass-cpu: add module licence and description
by Srinivas Kandagatla 14 Jun '16

14 Jun '16

This patch adds module licence to lpass-cpu driver, without this patch lpass-cpu module would taint with below error: snd_soc_lpass_cpu: module license 'unspecified' taints kernel. Disabling lock debugging due to kernel taint snd_soc_lpass_cpu: Unknown symbol regmap_write (err 0) snd_soc_lpass_cpu: Unknown symbol devm_kmalloc (err 0) ... Acked-by: Kenneth Westfield <kwestfie(a)codeaurora.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/lpass-cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 3cde9fb..eff3f9a 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -586,3 +586,6 @@ int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev) return 0; } EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_platform_remove); + +MODULE_DESCRIPTION("QTi LPASS CPU Driver"); +MODULE_LICENSE("GPL v2"); -- 2.8.3

2 4

[alsa-devel] [PATCH v3 0/2] ASoC: da7219: Convert driver to use generic FW functions
by Adam Thomson 14 Jun '16

14 Jun '16

This patch set converts the da7219 codec driver to use device/fwnode functions to access properties, instead of the DT only of_* functions, allowing ACPI to be used as well. The DT bindings for da7219 have a device node for the main codec properties, and a named child node (da7219_aad), which contains all of the accessory detection related properties for the device. ACPI also supports this kind of FW hierarchy (data only sub-nodes), but some support in the kernel needs to be added to take make use of this in driver code. The first patch adds functions to allow searching for a named child node of a device, for both DT and ACPI, and the second patch updates the codec driver to use the standard device/fwnode calls, including this new function. These changes are based on the v4.7-rc3 kernel. Changes in v3: - Use of_node_cmp() in device_get_named_child_node() to match DT node. Changes in v2: - Rebase to v4.7-rc1 - Small updates to codec patch based on previous reviewer comments Adam Thomson (2): device property: Add function to search for named child of device ASoC: da7219: Convert driver to use generic device/fwnode functions drivers/base/property.c | 28 ++++++++++++ include/acpi/acpi_bus.h | 7 +++ include/linux/acpi.h | 6 +++ include/linux/of.h | 14 +++--- include/linux/property.h | 3 ++ sound/soc/codecs/da7219-aad.c | 103 +++++++++++++++++++++--------------------- sound/soc/codecs/da7219.c | 34 +++++++------- 7 files changed, 119 insertions(+), 76 deletions(-) -- 1.9.3

3 4

[alsa-devel] [PATCH 1/2] ASoC: remove one extraneous 'const'
by Arnd Bergmann 14 Jun '16

14 Jun '16

A recent commit made a few arrays 'const', but also added the same attribute to a function return type, where it makes no sense, and we get a warning when building with W=1: sound/soc/codecs/arizona.c:1725:27: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers] static const char * const arizona_dai_clk_str(int clk_id) This removes it again. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: a3178a3ed798 ("ASoC: arizona: Add a couple of missing consts") --- This is one of two patches for warnings that were introduced first in today's linux-next. diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index ed0425763755..ecfdbfcae366 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1722,7 +1722,7 @@ restore_aif: return ret; } -static const char * const arizona_dai_clk_str(int clk_id) +static const char *arizona_dai_clk_str(int clk_id) { switch (clk_id) { case ARIZONA_CLK_SYSCLK:

3 4

[alsa-devel] [PATCH 0/7] ASoC: Intel: Update Bxt machine and pm support
by Vinod Koul 14 Jun '16

14 Jun '16

This series first adds constraints and other updates on Bxt-rt298 machine for various scenarios. Then it updates platform driver for PM support to enable firmware reload on suspend and fixes dma id for purge request, updates stall bits on stall/unstall commands and finally adds PM support in machine. Jayachandran B (2): ASoC: Intel: Skylake: Enable firmware reload in suspend ASoC: Intel: Skylake: Update DSP stall bits Jeeja KP (1): ASoC: Intel: Add support for PM ops in bxt-rt298 Senthilnathan Veppur (4): ASoC: Intel: Add DMIC 4 channel support for bxt machine ASoC: Intel: Add FE rate & channel constraints for bxt-rt298 ASoC: Intel: Update ignore suspend for bxt-rt298 ASoC: Intel: Skylake: Update FW purge for Broxton sound/soc/intel/boards/bxt_rt298.c | 140 ++++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/bxt-sst.c | 25 +++++- sound/soc/intel/skylake/skl-sst-dsp.c | 15 ++-- sound/soc/intel/skylake/skl-sst-dsp.h | 2 + sound/soc/intel/skylake/skl-sst-ipc.h | 3 + sound/soc/intel/skylake/skl-sst.c | 1 + sound/soc/intel/skylake/skl.c | 1 + 7 files changed, 176 insertions(+), 11 deletions(-) -- 1.9.1

2 14

[alsa-devel] [PATCH v2 0/2] ASoC: da7219: Convert driver to use generic FW functions
by Adam Thomson 14 Jun '16

14 Jun '16

This patch set converts the da7219 codec driver to use device/fwnode functions to access properties, instead of the DT only of_* functions, allowing ACPI to be used as well. The DT bindings for da7219 have a device node for the main codec properties, and a named child node (da7219_aad), which contains all of the accessory detection related properties for the device. ACPI also supports this kind of FW hierarchy (data only sub-nodes), but some support in the kernel needs to be added to take make use of this in driver code. The first patch adds functions to allow searching for a named child node of a device, for both DT and ACPI, and the second patch updates the codec driver to use the standard device/fwnode calls, including this new function. These changes are based on the v4.7-rc1 kernel. Changes in v2: - Rebase to v4.7-rc1 - Small updates to codec patch based on previous reviewer comments Adam Thomson (2): device property: Add function to search for named child of device ASoC: da7219: Convert driver to use generic device/fwnode functions drivers/base/property.c | 28 ++++++++++++ include/acpi/acpi_bus.h | 7 +++ include/linux/acpi.h | 6 +++ include/linux/property.h | 3 ++ sound/soc/codecs/da7219-aad.c | 103 +++++++++++++++++++++--------------------- sound/soc/codecs/da7219.c | 34 +++++++------- 6 files changed, 112 insertions(+), 69 deletions(-) -- 1.9.3

5 8

[alsa-devel] ASoC: Machine Driver Interaction with Codec Drivers
by Jeremy McDermond 14 Jun '16

14 Jun '16

I apologize in advance for the probably idiotic question. I’m working with writing a machine driver for our product and dealing with some potential user interface issues surrounding the number of controls being presented by the codec driver in the mixer. Is there a way to “hard-wire” kcontrols in the codec from the machine driver and hide them in the mixer? For example, our hardware doesn’t wire the IN2_L and IN2_R pins to anywhere, so the codec controls that determine their connections into the input mixer do nothing on our hardware and I’d like to hide them from the user in the mixer. Am I missing something or is there just no way to get there from here? -- Jeremy McDermond (NH6Z) Xenotropic Systems mcdermj(a)xenotropic.com

4 6

[alsa-devel] [PATCH] ASoC: rt298: Add jack suspend and resume functions.
by Bard Liao 13 Jun '16

13 Jun '16

We need to disable jack detection before entering suspend and enable it after resume. This was essential as headphone jack widget will always remain on if a jack is inserted and results in no audio after system resumes from a suspend. Signed-off-by: Senthilnathan Veppur <senthilnathanx.veppur(a)intel.com> Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt298.c | 20 ++++++++++++++++++++ sound/soc/codecs/rt298.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index d403c20..629b038 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1270,6 +1270,26 @@ static int rt298_i2c_remove(struct i2c_client *i2c) return 0; } +void rt298_jack_suspend(struct snd_soc_codec *codec) +{ + struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_dapm_context *dapm; + + dapm = snd_soc_codec_get_dapm(rt298->codec); + snd_soc_dapm_disable_pin(dapm, "LDO1"); + snd_soc_dapm_sync(dapm); +} +EXPORT_SYMBOL_GPL(rt298_jack_suspend); + +void rt298_jack_resume(struct snd_soc_codec *codec) +{ + struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec); + bool hp = false; + bool mic = false; + + rt298_jack_detect(rt298, &hp, &mic); +} +EXPORT_SYMBOL_GPL(rt298_jack_resume); static struct i2c_driver rt298_i2c_driver = { .driver = { diff --git a/sound/soc/codecs/rt298.h b/sound/soc/codecs/rt298.h index 3638f3d..2de342f 100644 --- a/sound/soc/codecs/rt298.h +++ b/sound/soc/codecs/rt298.h @@ -211,6 +211,8 @@ enum { }; int rt298_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack); +void rt298_jack_suspend(struct snd_soc_codec *codec); +void rt298_jack_resume(struct snd_soc_codec *codec); #endif /* __RT298_H__ */ -- 1.8.1.1.439.g50a6b54

3 4

[alsa-devel] [PATCH] ASoC: wm8985: add i2c dependency
by Arnd Bergmann 13 Jun '16

13 Jun '16

The wm8985 driver is now user-selectable, but building it with I2C disabled results in a link failure: sound/built-in.o: In function `wm8985_i2c_probe': :(.text+0x44914): undefined reference to `__devm_regmap_init_i2c' sound/built-in.o: In function `wm8985_exit': :(.exit.text+0x3d8): undefined reference to `i2c_del_driver' sound/built-in.o: In function `wm8985_modinit': :(.init.text+0x1454): undefined reference to `i2c_register_driver' This adds a Kconfig dependency the way that the other codec drivers have it. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 811e66de2241 ("ASoC: wm8985: add support for WM8758") --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index cb57f8fe2690..f555a5a004f7 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -986,6 +986,7 @@ config SND_SOC_WM8983 config SND_SOC_WM8985 tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver" + depends on I2C config SND_SOC_WM8988 tristate -- 2.7.0

2 9

[alsa-devel] [PATCH 0/2 v9] Add I2S audio support for ARC AXS10x boards
by Jose Abreu 13 Jun '16

13 Jun '16

ARC AXS10x platforms consist of a mainboard with several peripherals. One of those peripherals is an HDMI output port controlled by the ADV7511 transmitter. This patch set adds I2S audio for the AXS10x platform. NOTE: Although the mainline I2S driver uses ALSA DMA engine, this controller can be built without DMA support so it was necessary to add this custom platform driver so that HDMI audio works in AXS boards. Changes v8 -> v9: * Use defines in IRQ handling Changes v7 -> v8: * Build PIO PCM as module * Always unmask interrupts even when in DMA mode * Fallback to PIO mode only if ALSA DMA engine probe fails Changes v6 -> v7: * Discard the use of memcpy * Report IRQ_HANDLED only when there is an IRQ * Use interrupts to check if PIO mode is in use * Unmask interrupts only when in PIO mode * Remove empty functions Changes v5 -> v6: * Use SNDRV_DMA_TYPE_CONTINUOUS Changes v4 -> v5: * Resolve undefined references when compiling as module * Dropped adv7511 audio patches * Use DMA properties in I2S to check which mode to use: PIO or DMA (as suggested by Lars-Peter Clausen) Changes v3 -> v4: * Reintroduced custom PCM driver (see note below) * Use DT boolean to switch between ALSA DMA engine PCM or custom PCM * Use fifo depth to program I2S FCR * Update I2S documentation Changes v2 -> v3: * Removed pll_config functions (as suggested by Alexey Brodkin) * Removed HDMI start at adv7511_core (as suggested by Archit Taneja) * Use NOP functions for adv7511_audio (as suggested by Archit Taneja) * Added adv7511_audio_exit() function (as suggested by Archit Taneja) * Moved adv7511 to its own folder (as suggested by Archit Taneja) * Separated file rename of adv7511_core (as suggested by Emil Velikov) * Compile adv7511 as module if ALSA SoC is compiled as module * Load adv7511 audio only if declared in device tree (as suggested by Laurent Pinchart) * Dropped custom platform driver, using now ALSA DMA engine * Dropped IRQ handler for I2S Changes v1 -> v2: * DT bindings moved to separate patch (as suggested by Alexey Brodkin) * Removed defconfigs entries (as suggested by Alexey Brodkin) Cc: Carlos Palminha <palminha(a)synopsys.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Rob Herring <robh(a)kernel.org> Cc: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: linux-snps-arc(a)lists.infradead.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Jose Abreu (2): ASoC: dwc: Add PIO PCM extension ASoC: dwc: Add irq parameter to DOCUMENTATION .../devicetree/bindings/sound/designware-i2s.txt | 4 + sound/soc/dwc/Kconfig | 9 + sound/soc/dwc/Makefile | 1 + sound/soc/dwc/designware_i2s.c | 161 +++++++-------- sound/soc/dwc/designware_pcm.c | 225 +++++++++++++++++++++ sound/soc/dwc/local.h | 128 ++++++++++++ 6 files changed, 440 insertions(+), 88 deletions(-) create mode 100644 sound/soc/dwc/designware_pcm.c create mode 100644 sound/soc/dwc/local.h -- 1.9.1

2 3