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

[alsa-devel] dsd formats in ALSA plugins
by slava 27 Jun '18

27 Jun '18

Hello. I'm writing plugin with external filter plugin SDK, they make some manipulation on received samples. But i can't use dsd formats. As i understand, they not allowed in all plugins (extplug, ioplug and internal alsa-lib)? params_any + params_test_format(... dsd_u32_le) = error -22 Is this a ALSA lib restriction or i do something wrong Thanks

1 0

[alsa-devel] [PATCH] dt-bindings: Fix unbalanced quotation marks
by Jonathan Neuschäfer 26 Jun '18

26 Jun '18

Multiple binding documents have various forms of unbalanced quotation marks. Fix them. Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- Should I split this patch so that different parts can go through different trees? --- .../devicetree/bindings/arm/samsung/samsung-boards.txt | 2 +- .../devicetree/bindings/gpio/nintendo,hollywood-gpio.txt | 2 +- Documentation/devicetree/bindings/input/touchscreen/hideep.txt | 2 +- .../bindings/interrupt-controller/nvidia,tegra20-ictlr.txt | 2 +- .../devicetree/bindings/interrupt-controller/st,stm32-exti.txt | 2 +- Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +- Documentation/devicetree/bindings/net/fsl-fman.txt | 2 +- Documentation/devicetree/bindings/power/power_domain.txt | 2 +- Documentation/devicetree/bindings/regulator/tps65090.txt | 2 +- Documentation/devicetree/bindings/reset/st,sti-softreset.txt | 2 +- Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt | 2 +- Documentation/devicetree/bindings/sound/qcom,apq8096.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt index bdadc3da9556..6970f30a3770 100644 --- a/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt +++ b/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt @@ -66,7 +66,7 @@ Required root node properties: - "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale Octa board. - "insignal,origen" - for Exynos4210-based Insignal Origen board. - - "insignal,origen4412 - for Exynos4412-based Insignal Origen board. + - "insignal,origen4412" - for Exynos4412-based Insignal Origen board. Optional nodes: diff --git a/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt b/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt index 20fc72d9e61e..45a61b462287 100644 --- a/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt +++ b/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt @@ -1,7 +1,7 @@ Nintendo Wii (Hollywood) GPIO controller Required properties: -- compatible: "nintendo,hollywood-gpio +- compatible: "nintendo,hollywood-gpio" - reg: Physical base address and length of the controller's registers. - gpio-controller: Marks the device node as a GPIO controller. - #gpio-cells: Should be <2>. The first cell is the pin number and the diff --git a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt index 121d9b7c79a2..1063c30d53f7 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt @@ -32,7 +32,7 @@ i2c@00000000 { reg = <0x6c>; interrupt-parent = <&gpx1>; interrupts = <2 IRQ_TYPE_LEVEL_LOW>; - vdd-supply = <&ldo15_reg>"; + vdd-supply = <&ldo15_reg>; vid-supply = <&ldo18_reg>; reset-gpios = <&gpx1 5 0>; touchscreen-size-x = <1080>; diff --git a/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt b/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt index 1099fe0788fa..f246ccbf8838 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt @@ -15,7 +15,7 @@ Required properties: include "nvidia,tegra30-ictlr". - reg : Specifies base physical address and size of the registers. Each controller must be described separately (Tegra20 has 4 of them, - whereas Tegra30 and later have 5" + whereas Tegra30 and later have 5). - interrupt-controller : Identifies the node as an interrupt controller. - #interrupt-cells : Specifies the number of cells needed to encode an interrupt source. The value must be 3. diff --git a/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt b/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt index 136bd612bd83..6a36bf66d932 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt @@ -12,7 +12,7 @@ Required properties: specifier, shall be 2 - interrupts: interrupts references to primary interrupt controller (only needed for exti controller with multiple exti under - same parent interrupt: st,stm32-exti and st,stm32h7-exti") + same parent interrupt: st,stm32-exti and st,stm32h7-exti) Example: diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt index 356c29789cf5..3a66d3c483e1 100644 --- a/Documentation/devicetree/bindings/mips/brcm/soc.txt +++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt @@ -152,7 +152,7 @@ Required properties: - compatible : should contain one of: "brcm,bcm7425-timers" "brcm,bcm7429-timers" - "brcm,bcm7435-timers and + "brcm,bcm7435-timers" and "brcm,brcmstb-timers" - reg : the timers register range - interrupts : the interrupt line for this timer block diff --git a/Documentation/devicetree/bindings/net/fsl-fman.txt b/Documentation/devicetree/bindings/net/fsl-fman.txt index df873d1f3b7c..f8c33890bc29 100644 --- a/Documentation/devicetree/bindings/net/fsl-fman.txt +++ b/Documentation/devicetree/bindings/net/fsl-fman.txt @@ -238,7 +238,7 @@ PROPERTIES Must include one of the following: - "fsl,fman-dtsec" for dTSEC MAC - "fsl,fman-xgec" for XGEC MAC - - "fsl,fman-memac for mEMAC MAC + - "fsl,fman-memac" for mEMAC MAC - cell-index Usage: required diff --git a/Documentation/devicetree/bindings/power/power_domain.txt b/Documentation/devicetree/bindings/power/power_domain.txt index 9b387f861aed..7dec508987c7 100644 --- a/Documentation/devicetree/bindings/power/power_domain.txt +++ b/Documentation/devicetree/bindings/power/power_domain.txt @@ -133,7 +133,7 @@ located inside a PM domain with index 0 of a power controller represented by a node with the label "power". In the second example the consumer device are partitioned across two PM domains, the first with index 0 and the second with index 1, of a power controller that -is represented by a node with the label "power. +is represented by a node with the label "power". Optional properties: - required-opps: This contains phandle to an OPP node in another device's OPP diff --git a/Documentation/devicetree/bindings/regulator/tps65090.txt b/Documentation/devicetree/bindings/regulator/tps65090.txt index ca69f5e3040c..ae326f263597 100644 --- a/Documentation/devicetree/bindings/regulator/tps65090.txt +++ b/Documentation/devicetree/bindings/regulator/tps65090.txt @@ -16,7 +16,7 @@ Required properties: Optional properties: - ti,enable-ext-control: This is applicable for DCDC1, DCDC2 and DCDC3. If DCDCs are externally controlled then this property should be there. -- "dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3. +- dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3. If DCDCs are externally controlled and if it is from GPIO then GPIO number should be provided. If it is externally controlled and no GPIO entry then driver will just configure this rails as external control diff --git a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt index a21658f18fe6..3661e6153a92 100644 --- a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt +++ b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt @@ -15,7 +15,7 @@ Please refer to reset.txt in this directory for common reset controller binding usage. Required properties: -- compatible: Should be st,stih407-softreset"; +- compatible: Should be "st,stih407-softreset"; - #reset-cells: 1, see below example: diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt index 6a4aadc4ce06..84b28dbe9f15 100644 --- a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt +++ b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt @@ -30,7 +30,7 @@ Required properties: Board connectors: * Headset Mic - * Secondary Mic", + * Secondary Mic * DMIC * Ext Spk diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8096.txt b/Documentation/devicetree/bindings/sound/qcom,apq8096.txt index aa54e49fc8a2..c7600a93ab39 100644 --- a/Documentation/devicetree/bindings/sound/qcom,apq8096.txt +++ b/Documentation/devicetree/bindings/sound/qcom,apq8096.txt @@ -35,7 +35,7 @@ This binding describes the APQ8096 sound card, which uses qdsp for audio. "Digital Mic3" Audio pins and MicBias on WCD9335 Codec: - "MIC_BIAS1 + "MIC_BIAS1" "MIC_BIAS2" "MIC_BIAS3" "MIC_BIAS4" -- 2.17.1

7 6

[alsa-devel] [sound:topic/hda-core-intel 1/7] sound/hda/ext/hdac_ext_controller.c:283:3: error: 'bus' undeclared; did you mean 'ebus'?
by kbuild test robot 26 Jun '18

26 Jun '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-core-intel head: 21b51c0d69680da7cdf4c83d274edef2fe4f27bc commit: 7b4986f0c30484370183d935821b826c855c28bf [1/7] ALSA: hdac: ext: add wait for codec to respond after link reset config: x86_64-randconfig-x008-201825 (attached as .config) compiler: gcc-7 (Debian 7.3.0-16) 7.3.0 reproduce: git checkout 7b4986f0c30484370183d935821b826c855c28bf # save the attached .config to linux build tree make ARCH=x86_64 Note: the sound/topic/hda-core-intel HEAD 21b51c0d69680da7cdf4c83d274edef2fe4f27bc builds fine. It only hurts bisectibility. All errors (new ones prefixed by >>): sound/hda/ext/hdac_ext_controller.c: In function 'snd_hdac_ext_bus_link_get': >> sound/hda/ext/hdac_ext_controller.c:283:3: error: 'bus' undeclared (first use in this function); did you mean 'ebus'? bus->codec_mask = snd_hdac_chip_readw(bus, STATESTS); ^~~ ebus sound/hda/ext/hdac_ext_controller.c:283:3: note: each undeclared identifier is reported only once for each function it appears in vim +283 sound/hda/ext/hdac_ext_controller.c 258 259 int snd_hdac_ext_bus_link_get(struct hdac_ext_bus *ebus, 260 struct hdac_ext_link *link) 261 { 262 int ret = 0; 263 264 mutex_lock(&ebus->lock); 265 266 /* 267 * if we move from 0 to 1, count will be 1 so power up this link 268 * as well, also check the dma status and trigger that 269 */ 270 if (++link->ref_count == 1) { 271 if (!ebus->cmd_dma_state) { 272 snd_hdac_bus_init_cmd_io(&ebus->bus); 273 ebus->cmd_dma_state = true; 274 } 275 276 ret = snd_hdac_ext_bus_link_power_up(link); 277 278 /* 279 * wait for 521usec for codec to report status 280 * HDA spec section 4.3 - Codec Discovery 281 */ 282 udelay(521); > 283 bus->codec_mask = snd_hdac_chip_readw(bus, STATESTS); 284 dev_dbg(bus->dev, "codec_mask = 0x%lx\n", bus->codec_mask); 285 snd_hdac_chip_writew(bus, STATESTS, bus->codec_mask); 286 } 287 288 mutex_unlock(&ebus->lock); 289 return ret; 290 } 291 EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_get); 292 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH 0/4] Fix a broken/missing documentation at sound
by Mauro Carvalho Chehab 26 Jun '18

26 Jun '18

After running ./scripts/documentation-file-ref-check I noticed that it was complaining about the lack of a MultiSound file that used to be inside the old OSS sound system. That's actually a script, with seems to be needed in order to make the multisound driver to work. Also, it contains some instructions about how to use the module. Granted, this is old ISA stuff, but, as long as the driver remains in Kernel, it probably makes sense to keep the script somewhere. So, this patch restores the file from the git log, moving it to an existing directory and updates the module names. It also fixes the script, as it has some issues that prevents it to work with modern distributions (basically, include stuff at C files it produces). - Please notice that I don't have such hardware to test. So, I have no means to know if the produced exec file still makes sense. Mauro Carvalho Chehab (4): sound: restore MultiSound script alsa: multisound.sh: fix script to make it build with modern tools alsa: multisound.sh: update module namespace alsa: Fix references to Documentation/.*/MultiSound Documentation/sound/alsa-configuration.rst | 2 +- Documentation/sound/cards/multisound.sh | 1139 ++++++++++++++++++++ sound/isa/Kconfig | 2 +- 3 files changed, 1141 insertions(+), 2 deletions(-) create mode 100755 Documentation/sound/cards/multisound.sh -- 2.17.1

2 5

[alsa-devel] [PATCH 0/5] ALSA: hda/realtek - Comprehensive model list
by Takashi Iwai 26 Jun '18

26 Jun '18

Hi, this is a patch set to fill the missing entries for Realtek HD-audio codec quirk model strings. Takashi === Takashi Iwai (5): ALSA: hda/realtek - Comprehensive model list for ALC662 & co ALSA: hda/realtek - Comprehensive model list for ALC259 & co ALSA: hda/realtek - Comprehensive model list for ALC268 ALSA: hda/realtek - Comprehensive model list for ALC262 ALSA: hda/realtek - Comprehensive model list for ALC882 & co Documentation/sound/hd-audio/models.rst | 264 +++++++++++++++++++++++- sound/pci/hda/patch_realtek.c | 134 ++++++++++++ 2 files changed, 396 insertions(+), 2 deletions(-) -- 2.17.1

1 5

[alsa-devel] [PATCH] ASoC: soc-utils: Fix unregistration order
by Fabio Estevam 26 Jun '18

26 Jun '18

From: Fabio Estevam <fabio.estevam(a)nxp.com> The unregistration should happen in the opposite order of the registration, so change it accordingly. No real issue has been noticed, but it is good practice to keep the correct unregistration order. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/soc-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 2d9e98b..a863bb3 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -381,6 +381,6 @@ int __init snd_soc_util_init(void) void __exit snd_soc_util_exit(void) { - platform_device_unregister(soc_dummy_dev); platform_driver_unregister(&soc_dummy_driver); + platform_device_unregister(soc_dummy_dev); } -- 2.7.4

2 1

[alsa-devel] [PATCH 00/11] ASoC: qdsp6: Fix dt based module loading
by Srinivas Kandagatla 26 Jun '18

26 Jun '18

Recent discussion on https://lkml.org/lkml/2018/6/18/1282 suggested that qdsp6 code is using less common of_platform apis which would not give dt based module loading support. Suggestion from Rob was to add compatible strings to the dais nodes This patchset adds this. Also this patchset has 2 trivial fixes which is removing redundant owner and fix a error check in q6routing. Thanks, srini Srinivas Kandagatla (11): ASoC: q6adm: dt-bindings: add compatible string to routing ASoC: q6asm: dt-bindings: add compatible string to dais ASoC: q6afe: dt-bindings: add compatible string to dais ASoC: qdsp6: q6adm: use of_platform_populate/depopulate() ASoC: qdsp6: q6asm: use of_platform_populate/depopulate() ASoC: qdsp6: q6afe: use of_platform_populate/depopulate() ASoC: qdsp6: q6afe-dai: support dt based module loading ASoC: qdsp6: q6asm-dai: support dt based module loading ASoC: qdsp6: q6routing: support dt based module loading ASoC: qcom: apq8096: remove redundant owner assignment ASoC: qdsp6: q6routing: add proper error check Documentation/devicetree/bindings/sound/qcom,q6adm.txt | 6 ++++++ Documentation/devicetree/bindings/sound/qcom,q6afe.txt | 6 ++++++ Documentation/devicetree/bindings/sound/qcom,q6asm.txt | 6 ++++++ sound/soc/qcom/apq8096.c | 1 - sound/soc/qcom/qdsp6/q6adm.c | 15 ++------------- sound/soc/qcom/qdsp6/q6afe-dai.c | 8 ++++++++ sound/soc/qcom/qdsp6/q6afe.c | 16 ++-------------- sound/soc/qcom/qdsp6/q6asm-dai.c | 8 ++++++++ sound/soc/qcom/qdsp6/q6asm.c | 17 ++--------------- sound/soc/qcom/qdsp6/q6routing.c | 10 +++++++++- 10 files changed, 49 insertions(+), 44 deletions(-) -- 2.16.2

3 30

[alsa-devel] [PATCH v2 00/12] ASoC: qdsp6: Fix dt based module loading and minor fixes
by Srinivas Kandagatla 26 Jun '18

26 Jun '18

Recent discussion on https://lkml.org/lkml/2018/6/18/1282 suggested that qdsp6 code is using less common of_platform apis which would not give dt based module loading support. Suggestion from Rob was to add compatible strings to the dais nodes This patchset adds this. Also this patchset has 3 trivial fixes which is removing redundant owner, remove unused struct member and fix a error check in q6routing. Changes since v1: - Addressed few trivial comments from Niklas Thanks, srini Srinivas Kandagatla (12): ASoC: q6adm: dt-bindings: add compatible string to routing ASoC: q6asm: dt-bindings: add compatible string to dais ASoC: q6afe: dt-bindings: add compatible string to dais ASoC: qdsp6: q6adm: use of_platform_populate/depopulate() ASoC: qdsp6: q6asm: use of_platform_populate/depopulate() ASoC: qdsp6: q6afe: use of_platform_populate/depopulate() ASoC: qdsp6: q6afe-dai: support dt based module loading ASoC: qdsp6: q6asm-dai: support dt based module loading ASoC: qdsp6: q6routing: support dt based module loading ASoC: qcom: apq8096: remove redundant owner assignment ASoC: qdsp6: q6routing: add proper error check ASoC: qdsp6: q6asm: remove unused struct q6asm member Documentation/devicetree/bindings/sound/qcom,q6adm.txt | 6 ++++++ Documentation/devicetree/bindings/sound/qcom,q6afe.txt | 6 ++++++ Documentation/devicetree/bindings/sound/qcom,q6asm.txt | 6 ++++++ sound/soc/qcom/apq8096.c | 1 - sound/soc/qcom/qdsp6/q6adm.c | 16 ++-------------- sound/soc/qcom/qdsp6/q6afe-dai.c | 7 +++++++ sound/soc/qcom/qdsp6/q6afe.c | 16 ++-------------- sound/soc/qcom/qdsp6/q6asm-dai.c | 7 +++++++ sound/soc/qcom/qdsp6/q6asm.c | 17 ++--------------- sound/soc/qcom/qdsp6/q6routing.c | 9 ++++++++- 10 files changed, 46 insertions(+), 45 deletions(-) -- 2.16.2

3 29

[alsa-devel] [PATCH 1/1] ASoC: soc-pcm: DPCM cares BE channel constraint
by jiada_wang＠mentor.com 26 Jun '18

26 Jun '18

From: Jiada Wang <jiada_wang(a)mentor.com> Current DPCM is caring only FE channel configuration. Sometimes it will be trouble if user selects channel which isn't supported by BE. This patch adds new .dpcm_merged_chan on struct snd_soc_dai_link. DPCM will use FE / BE merged channel if struct snd_soc_dai_link has it. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- include/sound/soc.h | 2 ++ sound/soc/soc-pcm.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/sound/soc.h b/include/sound/soc.h index 1378dcd2128a..f7579f82cc00 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -957,6 +957,8 @@ struct snd_soc_dai_link { /* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1; + /* DPCM used FE & BE merged channel */ + unsigned int dpcm_merged_chan:1; /* pmdown_time is ignored at stop */ unsigned int ignore_pmdown_time:1; diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 45b52f7b9690..19ebfc958b9d 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1715,6 +1715,46 @@ static u64 dpcm_runtime_base_format(struct snd_pcm_substream *substream) return formats; } +static void dpcm_runtime_base_chan(struct snd_pcm_substream *substream, + unsigned int *channels_min, + unsigned int *channels_max) +{ + struct snd_soc_pcm_runtime *fe = substream->private_data; + struct snd_soc_dpcm *dpcm; + int stream = substream->stream; + + if (!fe->dai_link->dpcm_merged_chan) + return; + + *channels_min = 0; + *channels_max = UINT_MAX; + + /* + * It returns merged BE codec channel; + * if FE want to use it (= dpcm_merged_chan) + */ + + list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + struct snd_soc_pcm_runtime *be = dpcm->be; + struct snd_soc_dai_driver *codec_dai_drv; + struct snd_soc_pcm_stream *codec_stream; + int i; + + for (i = 0; i < be->num_codecs; i++) { + codec_dai_drv = be->codec_dais[i]->driver; + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + codec_stream = &codec_dai_drv->playback; + else + codec_stream = &codec_dai_drv->capture; + + *channels_min = max(*channels_min, + codec_stream->channels_min); + *channels_max = min(*channels_max, + codec_stream->channels_max); + } + } +} + static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -1722,11 +1762,17 @@ static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream) struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai_driver *cpu_dai_drv = cpu_dai->driver; u64 format = dpcm_runtime_base_format(substream); + unsigned int channels_min = 0, channels_max = UINT_MAX; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) dpcm_init_runtime_hw(runtime, &cpu_dai_drv->playback, format); else dpcm_init_runtime_hw(runtime, &cpu_dai_drv->capture, format); + + dpcm_runtime_base_chan(substream, &channels_min, &channels_max); + + runtime->hw.channels_min = max(channels_min, runtime->hw.channels_min); + runtime->hw.channels_max = min(channels_max, runtime->hw.channels_max); } static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd); -- 2.17.0

3 5

[alsa-devel] [PATCH 1/2] ASoC: add generic simple-amplifier support
by Nicolò Veronese 26 Jun '18

26 Jun '18

Many boards have speaker amplifier attached on an analog output. Most of them are only managed by a mute or shutdown GPIO. In order to reduce duplicate driver, this patch adds generic/simple-amplifier. Signed-off-by: Nicolò Veronese <nicveronese(a)gmail.com> --- sound/soc/generic/Kconfig | 5 ++ sound/soc/generic/Makefile | 2 + sound/soc/generic/simple-amplifier.c | 109 +++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 sound/soc/generic/simple-amplifier.c diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig index c954be0..ace17c3a 100644 --- a/sound/soc/generic/Kconfig +++ b/sound/soc/generic/Kconfig @@ -7,6 +7,11 @@ config SND_SIMPLE_CARD help This option enables generic simple sound card support +config SND_SIMPLE_AMPLIFIER + tristate "ASoC Simple Amplifier support" + help + This option enables generic simple amplifier support + config SND_SIMPLE_SCU_CARD tristate "ASoC Simple SCU sound card support" depends on OF diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile index 9dec293..805a746 100644 --- a/sound/soc/generic/Makefile +++ b/sound/soc/generic/Makefile @@ -1,12 +1,14 @@ # SPDX-License-Identifier: GPL-2.0 snd-soc-simple-card-utils-objs := simple-card-utils.o snd-soc-simple-card-objs := simple-card.o +snd-soc-simple-amplifier-objs := simple-amplifier.o snd-soc-simple-scu-card-objs := simple-scu-card.o snd-soc-audio-graph-card-objs := audio-graph-card.o snd-soc-audio-graph-scu-card-objs := audio-graph-scu-card.o obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) += snd-soc-simple-card-utils.o obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o +obj-$(CONFIG_SND_SIMPLE_AMPLIFIER) += snd-soc-simple-amplifier.o obj-$(CONFIG_SND_SIMPLE_SCU_CARD) += snd-soc-simple-scu-card.o obj-$(CONFIG_SND_AUDIO_GRAPH_CARD) += snd-soc-audio-graph-card.o obj-$(CONFIG_SND_AUDIO_GRAPH_SCU_CARD) += snd-soc-audio-graph-scu-card.o diff --git a/sound/soc/generic/simple-amplifier.c b/sound/soc/generic/simple-amplifier.c new file mode 100644 index 0000000..e135a43 --- /dev/null +++ b/sound/soc/generic/simple-amplifier.c @@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 +// ALSA SoC simple amplifier driver +// +// Copyright 2018 +// Author: Nicolò Veronese <nicveronese(a)gmail.com> + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/gpio/consumer.h> +#include <linux/regulator/consumer.h> + +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +/* This struct is used to save the context */ +struct simple_amp_data { + struct device *dev; + struct regmap *regmap; + struct gpio_desc *power_gpio; +}; + +static int simple_amp_power_event(struct snd_soc_dapm_widget *widget, + struct snd_kcontrol *kctrl, int event) +{ + struct snd_soc_component *c = snd_soc_dapm_to_component(widget->dapm); + struct simple_amp_data *data = snd_soc_component_get_drvdata(c); + + /* Shutdown GPIO */ + if (data->power_gpio) + gpiod_set_value_cansleep(data->power_gpio, SND_SOC_DAPM_EVENT_ON(event)); + + return 0; +} + +static const struct snd_soc_dapm_widget simple_amp_dapm_widgets[] = { + SND_SOC_DAPM_INPUT("LEFT AMP IN"), + SND_SOC_DAPM_INPUT("RIGHT AMP IN"), + + SND_SOC_DAPM_OUTPUT("SPK LEFT"), + SND_SOC_DAPM_OUTPUT("SPK RIGHT"), + + SND_SOC_DAPM_REGULATOR_SUPPLY("VCC", 20, 0), + SND_SOC_DAPM_SPK("MUTE", simple_amp_power_event), +}; + +static const struct snd_soc_dapm_route simple_amp_dapm_routes[] = { + { "MUTE", NULL, "LEFT AMP IN" }, + { "MUTE", NULL, "RIGHT AMP IN" }, + + { "SPK LEFT", NULL, "VCC" }, + { "SPK RIGHT", NULL, "VCC" }, + + { "SPK LEFT", NULL, "MUTE" }, + { "SPK RIGHT", NULL, "MUTE" }, +}; + +static const struct snd_soc_component_driver simple_amp_component_driver = { + .name = "simple-amplifier", + .dapm_widgets = simple_amp_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(simple_amp_dapm_widgets), + .dapm_routes = simple_amp_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(simple_amp_dapm_routes), +}; + +static int asoc_simple_amp_probe(struct platform_device *pdev) +{ + struct simple_amp_data *data; + struct device *dev = &pdev->dev; + int ret; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + data->dev = &pdev->dev; + platform_set_drvdata(pdev, data); + + if(of_property_read_bool(pdev->dev.of_node,"shutdown-gpios")) { + data->power_gpio = devm_gpiod_get_optional(&pdev->dev, "shutdown", GPIOD_OUT_LOW); + + if (IS_ERR(data->power_gpio)) { + ret = PTR_ERR(data->power_gpio); + dev_err(&pdev->dev, "Failed to get shutdown gpio: %d\n", ret); + return ret; + } + } + + return devm_snd_soc_register_component(dev, + &simple_amp_component_driver, NULL, 0); +} + +static const struct of_device_id asoc_simple_of_match[] = { + { .compatible = "simple-audio-amplifier", }, + {}, +}; +MODULE_DEVICE_TABLE(of, asoc_simple_of_match); + +static struct platform_driver asoc_simple_amp = { + .driver = { + .name = "asoc-simple-amplifier", + .of_match_table = of_match_ptr(asoc_simple_of_match), + }, + .probe = asoc_simple_amp_probe, +}; + +module_platform_driver(asoc_simple_amp); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("ASoC Simple Amplifier"); +MODULE_AUTHOR("Nicolò Veronese <nicveronese(a)gmail.com>"); -- 2.7.4

4 11