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

[PATCH v4 00/22] Add Allwinner H3/H5/H6/A64 HDMI audio
by Clément Péron 02 Nov '20

02 Nov '20

Hi, New test done by Maxime using TDM show that's LRCK is indeed inverted so I drop the patch reverted in v2. And HDMI requires an inverted LRCK so let's readd the frame-inversion in the device-tree. I have also added a patch to change set_chan_cfg. Please note that I can't test TDM and only have a Allwinner H6. So test and comment on other Allwinner chips are welcome! Regards, Clement Change since v3: - add Samuel Holland patch to reconfigure FIFO_TX_REG when suspend is enabled - readd inversion to H6 LRCK sun50i_h6_i2s_set_soc_fmt() - Fix get_wss() for sun4i - Add a commit to fix checkpatch warning Change since v2: - rebase on next-20200918 - drop revert LRCK polarity patch - readd simple-audio-card,frame-inversion in dts - Add patch for changing set_chan_cfg params Change since v1: - rebase on next-20200828 - add revert LRCK polarity - remove all simple-audio-card,frame-inversion in dts - add Ondrej patches for Orange Pi board - Add arm64 defconfig patch Clément Péron (6): ASoC: sun4i-i2s: Change set_chan_cfg() params ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit ASoC: sun4i-i2s: Fix sun8i volatile regs arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 arm64: defconfig: Enable Allwinner i2s driver ASoC: sun4i-i2s: fix coding-style for callback definition Jernej Skrabec (3): ASoC: sun4i-i2s: Add support for H6 I2S dt-bindings: ASoC: sun4i-i2s: Add H6 compatible arm64: dts: allwinner: h6: Add HDMI audio node Marcus Cooper (9): ASoC: sun4i-i2s: Set sign extend sample ASoc: sun4i-i2s: Add 20 and 24 bit support arm: dts: sunxi: h3/h5: Add DAI node for HDMI arm: dts: sunxi: h3/h5: Add HDMI audio arm64: dts: allwinner: a64: Add DAI node for HDMI arm64: dts: allwinner: a64: Add HDMI audio arm: sun8i: h3: Add HDMI audio to Orange Pi 2 arm: sun8i: h3: Add HDMI audio to Beelink X2 arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Ondrej Jirman (3): arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Samuel Holland (1): ASoC: sun4i-i2s: Fix setting of FIFO modes .../sound/allwinner,sun4i-a10-i2s.yaml | 2 + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 33 ++ .../boot/dts/allwinner/sun50i-a64-pine64.dts | 8 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 34 ++ .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 8 + .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 8 + .../dts/allwinner/sun50i-h6-orangepi-3.dts | 8 + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++ arch/arm64/configs/defconfig | 1 + sound/soc/sunxi/sun4i-i2s.c | 374 +++++++++++++++--- 14 files changed, 487 insertions(+), 54 deletions(-) -- 2.25.1

4 38

[PATCH] ASoC: ti: davinci-mcasp: fix possible reference leak in __davinci_mcasp_set_clkdiv
by Zhang Qilong 02 Nov '20

02 Nov '20

pm_runtime_get_sync() will increment pm usage counter whatever it does. Forgetting to call pm_runtime_put will result in reference leak in __davinci_mcasp_set_clkdiv, so we should fix it. Signed-off-by: Zhang Qilong <zhangqilong3(a)huawei.com> --- sound/soc/ti/davinci-mcasp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index a6b72ad53b43..4b46dd827f3f 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -607,6 +607,8 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, static int __davinci_mcasp_set_clkdiv(struct davinci_mcasp *mcasp, int div_id, int div, bool explicit) { + int ret = 0; + pm_runtime_get_sync(mcasp->dev); switch (div_id) { case MCASP_CLKDIV_AUXCLK: /* MCLK divider */ @@ -644,11 +646,11 @@ static int __davinci_mcasp_set_clkdiv(struct davinci_mcasp *mcasp, int div_id, break; default: - return -EINVAL; + ret = -EINVAL; } pm_runtime_put(mcasp->dev); - return 0; + return ret; } static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, -- 2.17.1

2 1

[PATCH v2 0/2] Modify documentation and machine driver for SC7180 sound card
by Ajye Huang 02 Nov '20

02 Nov '20

Note: - The patch is made by the collaboration of Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> Cheng-Yi Chiang <cychiang(a)chromium.org> Changes from v1 to v2: - Ducumentation: Modify the dimc-gpios property description and examples. - Machine driver: - Remove "qcom,sc7180-sndcard-rt5682-m98357-2mic" compatible - See gpio property and use anadditional control. Thanks for the review! Ajye Huang (2): ASoC: google: dt-bindings: modify machine bindings for two MICs case ASoC: qcom: sc7180: Modify machine driver for 2mic .../bindings/sound/google,sc7180-trogdor.yaml | 58 ++++++++++++++++++ sound/soc/qcom/sc7180.c | 59 +++++++++++++++++++ 2 files changed, 117 insertions(+) -- 2.25.1

3 6

[PATCH] ASoC: nau8315: add codec driver
by David Lin 01 Nov '20

01 Nov '20

Add codec driver for Nuvoton NAU8315. Signed-off-by: David Lin <CTLIN0(a)nuvoton.com> --- .../devicetree/bindings/sound/nau8315.txt | 18 ++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/nau8315.c | 166 ++++++++++++++++++ 4 files changed, 191 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nau8315.txt create mode 100644 sound/soc/codecs/nau8315.c diff --git a/Documentation/devicetree/bindings/sound/nau8315.txt b/Documentation/devicetree/bindings/sound/nau8315.txt new file mode 100644 index 000000000000..6eaec46f384c --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nau8315.txt @@ -0,0 +1,18 @@ +Nuvoton NAU8315 Mono Class-D Amplifier + +Required properties: +- compatible : "nuvoton,nau8315" + +Optional properties: +- enable-gpios : GPIO specifier for the chip's device enable input(EN) pin. + If this option is not specified then driver does not manage + the pin state (e.g. chip is always on). + +Example: + +#include <dt-bindings/gpio/gpio.h> + +nau8315 { + compatible = "nuvoton,nau8315"; + enable-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; +}; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 5791b7056af6..2b6eceb3573c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -130,6 +130,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_MT6358 imply SND_SOC_MT6359 imply SND_SOC_MT6660 + imply SND_SOC_NAU8315 imply SND_SOC_NAU8540 imply SND_SOC_NAU8810 imply SND_SOC_NAU8822 @@ -1760,6 +1761,10 @@ config SND_SOC_MT6660 Select N if you don't have MT6660 on board. Select M to build this as module. +config SND_SOC_NAU8315 + tristate "Nuvoton Technology Corporation NAU8315 CODEC" + depends on GPIOLIB + config SND_SOC_NAU8540 tristate "Nuvoton Technology Corporation NAU85L40 CODEC" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 11ce98c25d6c..144d9256d4d5 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -129,6 +129,7 @@ snd-soc-mt6351-objs := mt6351.o snd-soc-mt6358-objs := mt6358.o snd-soc-mt6359-objs := mt6359.o snd-soc-mt6660-objs := mt6660.o +snd-soc-nau8315-objs := nau8315.o snd-soc-nau8540-objs := nau8540.o snd-soc-nau8810-objs := nau8810.o snd-soc-nau8822-objs := nau8822.o @@ -438,6 +439,7 @@ obj-$(CONFIG_SND_SOC_MT6351) += snd-soc-mt6351.o obj-$(CONFIG_SND_SOC_MT6358) += snd-soc-mt6358.o obj-$(CONFIG_SND_SOC_MT6359) += snd-soc-mt6359.o obj-$(CONFIG_SND_SOC_MT6660) += snd-soc-mt6660.o +obj-$(CONFIG_SND_SOC_NAU8315) += snd-soc-nau8315.o obj-$(CONFIG_SND_SOC_NAU8540) += snd-soc-nau8540.o obj-$(CONFIG_SND_SOC_NAU8810) += snd-soc-nau8810.o obj-$(CONFIG_SND_SOC_NAU8822) += snd-soc-nau8822.o diff --git a/sound/soc/codecs/nau8315.c b/sound/soc/codecs/nau8315.c new file mode 100644 index 000000000000..e6bc5c0a5036 --- /dev/null +++ b/sound/soc/codecs/nau8315.c @@ -0,0 +1,166 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// nau8315.c -- NAU8315 ALSA SoC Audio Amplifier Driver +// +// Copyright 2020 Nuvoton Technology Crop. +// +// Author: David Lin <ctlin0(a)nuvoton.com> +// +// Based on MAX98357A.c + +#include <linux/acpi.h> +#include <linux/device.h> +#include <linux/err.h> +#include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dai.h> +#include <sound/soc-dapm.h> + +struct nau8315_priv { + struct gpio_desc *enable; + int enpin_switch; +}; + +static int nau8315_daiops_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct nau8315_priv *nau8315 = + snd_soc_component_get_drvdata(component); + + if (!nau8315->enable) + return 0; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + if (nau8315->enpin_switch) { + gpiod_set_value(nau8315->enable, 1); + dev_dbg(component->dev, "set enable to 1"); + } + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + gpiod_set_value(nau8315->enable, 0); + dev_dbg(component->dev, "set enable to 0"); + break; + } + + return 0; +} + +static int nau8315_enpin_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + struct nau8315_priv *nau8315 = + snd_soc_component_get_drvdata(component); + + if (event & SND_SOC_DAPM_POST_PMU) + nau8315->enpin_switch = 1; + else if (event & SND_SOC_DAPM_POST_PMD) + nau8315->enpin_switch = 0; + + return 0; +} + +static const struct snd_soc_dapm_widget nau8315_dapm_widgets[] = { + SND_SOC_DAPM_OUTPUT("Speaker"), + SND_SOC_DAPM_OUT_DRV_E("EN_Pin", SND_SOC_NOPM, 0, 0, NULL, 0, + nau8315_enpin_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), +}; + +static const struct snd_soc_dapm_route nau8315_dapm_routes[] = { + {"EN_Pin", NULL, "HiFi Playback"}, + {"Speaker", NULL, "EN_Pin"}, +}; + +static const struct snd_soc_component_driver nau8315_component_driver = { + .dapm_widgets = nau8315_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(nau8315_dapm_widgets), + .dapm_routes = nau8315_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(nau8315_dapm_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; + +static const struct snd_soc_dai_ops nau8315_dai_ops = { + .trigger = nau8315_daiops_trigger, +}; + +#define NAU8315_RATES SNDRV_PCM_RATE_8000_96000 +#define NAU8315_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_3LE) + +static struct snd_soc_dai_driver nau8315_dai_driver = { + .name = "nau8315-hifi", + .playback = { + .stream_name = "HiFi Playback", + .formats = NAU8315_FORMATS, + .rates = NAU8315_RATES, + .channels_min = 1, + .channels_max = 2, + }, + .ops = &nau8315_dai_ops, +}; + +static int nau8315_platform_probe(struct platform_device *pdev) +{ + struct nau8315_priv *nau8315; + + nau8315 = devm_kzalloc(&pdev->dev, sizeof(*nau8315), GFP_KERNEL); + if (!nau8315) + return -ENOMEM; + + nau8315->enable = devm_gpiod_get_optional(&pdev->dev, + "enable", GPIOD_OUT_LOW); + if (IS_ERR(nau8315->enable)) + return PTR_ERR(nau8315->enable); + + dev_set_drvdata(&pdev->dev, nau8315); + + return devm_snd_soc_register_component(&pdev->dev, + &nau8315_component_driver, + &nau8315_dai_driver, 1); +} + +#ifdef CONFIG_OF +static const struct of_device_id nau8315_device_id[] = { + { .compatible = "nuvoton,nau8315" }, + {} +}; +MODULE_DEVICE_TABLE(of, nau8315_device_id); +#endif + +#ifdef CONFIG_ACPI +static const struct acpi_device_id nau8315_acpi_match[] = { + { "NVTN2010", 0 }, + {}, +}; +MODULE_DEVICE_TABLE(acpi, nau8315_acpi_match); +#endif + +static struct platform_driver nau8315_platform_driver = { + .driver = { + .name = "nau8315", + .of_match_table = of_match_ptr(nau8315_device_id), + .acpi_match_table = ACPI_PTR(nau8315_acpi_match), + }, + .probe = nau8315_platform_probe, +}; +module_platform_driver(nau8315_platform_driver); + +MODULE_DESCRIPTION("ASoC NAU8315 Mono Class-D Amplifier Driver"); +MODULE_AUTHOR("David Lin <ctlin0(a)nuvoton.com>"); +MODULE_LICENSE("GPL v2"); -- 2.25.1 =========================================================================================== The privileged confidential information contained in this email is intended for use only by the addressees as indicated by the original sender of this email. If you are not the addressee indicated in this email or are not responsible for delivery of the email to such a person, please kindly reply to the sender indicating this fact and delete all copies of it from your computer and network server immediately. Your cooperation is highly appreciated. It is advised that any unauthorized use of confidential information of Nuvoton is strictly prohibited; and any information in this email irrelevant to the official business of Nuvoton shall be deemed as neither given nor endorsed by Nuvoton.

3 2

AIM SC808
by Marcin Kocur 31 Oct '20

31 Oct '20

Hello all, I own this card since recently: 03:00.0 Audio device: C-Media Electronics Inc CM8888 [Oxygen Express] Subsystem: C-Media Electronics Inc HDA Controller Flags: bus master, fast devsel, latency 0, IRQ 31, IOMMU group 7 Memory at fcd00000 (32-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: snd_hda_intel Kernel modules: snd_hda_intel and I found out it doesn't work great. Only headphone output is functioning, RCA line out does not (haven't checked the rest). I found models list in /usr/lib/modules/5.9.2-arch1-1/build/Documentation/sound/hd-audio/models.rst and tested them all using a rmmod / modprobe bash script but none of them seems to enable RCA output. Windows drivers have possibility to switch between headphone and RCA output from manufacturer's app (there is a click sound coming from electronics of the card when I do this). I never tampered with low level hardware and I'm not familiar with ALSA development but what I was thinking is that maybe an ALSA snd_hda_intel developer would be interested in receiving this card for tests? -- Pozdrawiam / Greetings Marcin Kocur █

1 0

[PATCH 0/2] ASoC: mt6359: skip first time data at the beginning of DMIC recording
by Jiaxin Yu 31 Oct '20

31 Oct '20

This patch fixed the pop noise at the beginning of DMIC recording. Jiaxin Yu (2): ASoC: mt6359: skip first time data at the beginning of DMIC recording dt-bindings: mediatek: mt8192: add ul-delay-ms property .../devicetree/bindings/sound/mt6359.yaml | 6 +++ sound/soc/codecs/mt6359.c | 38 +++++++++++++++++-- sound/soc/codecs/mt6359.h | 1 + 3 files changed, 41 insertions(+), 4 deletions(-) -- 2.18.0

4 8

Re: [linux-sunxi] Re: [PATCH v10 00/15] Add Allwinner H3/H5/H6/A64 HDMI audio
by Jernej Škrabec 30 Oct '20

30 Oct '20

Dne petek, 30. oktober 2020 ob 21:50:43 CET je Stefan Monnier napisal(a): > >> This series add H6 I2S support and the I2S node missing to support > >> HDMI audio in different Allwinner SoC. > > > > Applied to > > > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git > > for-next > > Yay! Note that this doesn't bring HDMI audio card just yet. Another driver will be needed for that. > > Now, I wonder: will that make it easier to add support for HDMI-Audio for > the A10/A20? No, A10/A20 HDMI audio uses completely different interface. > > (there was a patch for that submitted earlier this year by Stefan > Mavrodiev <stefan(a)olimex.com>, but it seems there hasn't been any > progress on it since then (I think the last message on it concluded that > it should be rewritten to use ALSA instead of ASoC)). IIUC original author left Olimex, so work stalled. Best regards, Jernej > > [ To clarify, don't know what's the difference between ALSA and ASoC; > I'm only interested here as an owner of an A20 box on which I'd > love to be able to use the HDMI-Audio. ] > > > -- Stefan

1 0

[PATCH v2 0/2] Add rt1015 support to CML boards
by Brent Lu 30 Oct '20

30 Oct '20

First patch adds tdm 4-slot 100fs DAI setting to avoid jitter of using 64fs on CML boards. Second patch is a DMI quirk for HP Dooly. Changes since v1: -Add comment on Dooly's DMI quirk Brent Lu (2): ASoC: intel: sof_rt5682: Add support for cml_rt1015_rt5682 ASoC: intel: sof_rt5682: Add quirk for Dooly sound/soc/intel/boards/sof_rt5682.c | 65 +++++++++++++++++-- .../intel/common/soc-acpi-intel-cml-match.c | 13 ++++ 2 files changed, 73 insertions(+), 5 deletions(-) -- 2.17.1

3 4

[PATCH] ASoC: qcom: MSM8996 depends on COMMON_CLK
by Randy Dunlap 30 Oct '20

30 Oct '20

From: Randy Dunlap <rdunlap(a)infradead.org> Fix a kconfig warning in sound/soc/qcom: WARNING: unmet direct dependencies detected for SND_SOC_QDSP6 Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_QCOM [=y] && QCOM_APR [=y] && COMMON_CLK [=n] Selected by [y]: - SND_SOC_MSM8996 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_QCOM [=y] && QCOM_APR [=y] This is needed because 'select' does not follow dependency chains. Fixes: a6f933f63f2f ("ASoC: qcom: apq8096: Add db820c machine driver") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org --- Found in linux-next but applies to mainline. sound/soc/qcom/Kconfig | 1 + 1 file changed, 1 insertion(+) --- linux-next-20201016.orig/sound/soc/qcom/Kconfig +++ linux-next-20201016/sound/soc/qcom/Kconfig @@ -106,6 +106,7 @@ config SND_SOC_QDSP6 config SND_SOC_MSM8996 tristate "SoC Machine driver for MSM8996 and APQ8096 boards" depends on QCOM_APR + depends on COMMON_CLK select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON help

2 2

[PATCH 0/2] Add rt1015 support to CML boards
by Brent Lu 30 Oct '20

30 Oct '20

First patch adds tdm 4-slot 100fs DAI setting to avoid jitter of using 64fs on CML boards. Second patch is a DMI quirk for HP Dooly. Brent Lu (2): ASoC: intel: sof_rt5682: Add support for cml_rt1015_rt5682 ASoC: intel: sof_rt5682: Add quirk for Dooly sound/soc/intel/boards/sof_rt5682.c | 61 +++++++++++++++++-- .../intel/common/soc-acpi-intel-cml-match.c | 13 ++++ 2 files changed, 69 insertions(+), 5 deletions(-) -- 2.17.1

4 6