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

[PATCH -next] ASoC: tas2781: No need to set device_driver owner
by Yang Li 12 Jul '23

12 Jul '23

Remove .owner field if calls are used which set it automatically. to silence the warning: ./sound/soc/codecs/tas2781-i2c.c:746:3-8: No need to set .owner here. The core will do it. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5589 Signed-off-by: Yang Li <yang.lee(a)linux.alibaba.com> --- sound/soc/codecs/tas2781-i2c.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 4c59429a42b7..55cd5e3c23a5 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -743,7 +743,6 @@ MODULE_DEVICE_TABLE(acpi, tasdevice_acpi_match); static struct i2c_driver tasdevice_i2c_driver = { .driver = { .name = "tas2781-codec", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(tasdevice_of_match), #ifdef CONFIG_ACPI .acpi_match_table = ACPI_PTR(tasdevice_acpi_match), -- 2.20.1.7.g153144c

2 1

[PATCH] ASoC: dt-bindings: nau8821: Convert to dtschema
by Seven Lee 12 Jul '23

12 Jul '23

Convert the NAU8821 audio CODEC bindings to DT schema. Signed-off-by: Seven Lee <wtli(a)nuvoton.com> --- .../devicetree/bindings/sound/nau8821.txt | 55 -------- .../bindings/sound/nuvoton,nau8821.yaml | 120 ++++++++++++++++++ 2 files changed, 120 insertions(+), 55 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/nau8821.txt create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml diff --git a/Documentation/devicetree/bindings/sound/nau8821.txt b/Documentation/devicetree/bindings/sound/nau8821.txt deleted file mode 100644 index 7c84e7c7327a..000000000000 --- a/Documentation/devicetree/bindings/sound/nau8821.txt +++ /dev/null @@ -1,55 +0,0 @@ -Nuvoton NAU88L21 audio codec - -This device supports I2C only. - -Required properties: - - compatible : Must be "nuvoton,nau8821" - - - reg : the I2C address of the device. This is either 0x1B (CSB=0) or 0x54 (CSB=1). - -Optional properties: - - nuvoton,jkdet-enable: Enable jack detection via JKDET pin. - - nuvoton,jkdet-pull-enable: Enable JKDET pin pull. If set - pin pull enabled, - otherwise pin in high impedance state. - - nuvoton,jkdet-pull-up: Pull-up JKDET pin. If set then JKDET pin is pull up, otherwise pull down. - - nuvoton,jkdet-polarity: JKDET pin polarity. 0 - active high, 1 - active low. - - - nuvoton,vref-impedance: VREF Impedance selection - 0 - Open - 1 - 25 kOhm - 2 - 125 kOhm - 3 - 2.5 kOhm - - - nuvoton,micbias-voltage: Micbias voltage level. - 0 - VDDA - 1 - VDDA - 2 - VDDA * 1.1 - 3 - VDDA * 1.2 - 4 - VDDA * 1.3 - 5 - VDDA * 1.4 - 6 - VDDA * 1.53 - 7 - VDDA * 1.53 - - - nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms - - nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms - - - nuvoton,dmic-clk-threshold: the ADC threshold of DMIC clock. - - nuvoton,key_enable: Headset button detection switch. - -Example: - - headset: nau8821@1b { - compatible = "nuvoton,nau8821"; - reg = <0x1b>; - interrupt-parent = <&gpio>; - interrupts = <23 IRQ_TYPE_LEVEL_LOW>; - nuvoton,jkdet-enable; - nuvoton,jkdet-pull-enable; - nuvoton,jkdet-pull-up; - nuvoton,jkdet-polarity = <GPIO_ACTIVE_LOW>; - nuvoton,vref-impedance = <2>; - nuvoton,micbias-voltage = <6>; - nuvoton,jack-insert-debounce = <7>; - nuvoton,jack-eject-debounce = <7>; - nuvoton,dmic-clk-threshold = 3072000; - }; diff --git a/Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml b/Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml new file mode 100644 index 000000000000..728223d20876 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml @@ -0,0 +1,120 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/nuvoton,nau8821.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NAU88L21 audio codec + +maintainers: + - Seven Lee <wtli(a)nuvoton.com> + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + const: nuvoton,nau8821 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + nuvoton,jkdet-enable: + description: Enable jack detection via JKDET pin. + type: boolean + + nuvoton,jkdet-pull-enable: + description: Enable JKDET pin pull. If set - pin pull enabled, + otherwise pin in high impedance state. + type: boolean + + nuvoton,jkdet-pull-up: + description: Pull-up JKDET pin. If set then JKDET pin is pull up, + otherwise pull down. + type: boolean + + nuvoton,jkdet-polarity: + description: JKDET pin polarity. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: + - 0 # active high + - 1 # active low + default: 1 + + nuvoton,micbias-voltage: + description: MICBIAS output level select. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: + - 0 # VDDA + - 1 # VDDA * 1 + - 2 # VDDA * 1.1 + - 3 # VDDA * 1.2 + - 4 # VDDA * 1.3 + - 5 # VDDA * 1.4 + - 6 # VDDA * 1.53 + - 7 # VDDA * 1.53 + default: 6 + + nuvoton,vref-impedance: + description: VMID Tie-off impedance select. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: + - 0 # open(default) + - 1 # 25KOhms + - 2 # 125KOhms + - 3 # 2.5KOhms + default: 2 + + nuvoton,jack-insert-debounce: + description: number from 0 to 7 that sets debounce time to 2^(n+2)ms. + $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 7 + default: 7 + + nuvoton,jack-eject-debounce: + description: number from 0 to 7 that sets debounce time to 2^(n+2)ms. + $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 7 + default: 0 + + nuvoton,dmic-clk-threshold: + description: DMIC clock speed expected value. Unit is Hz. + $ref: /schemas/types.yaml#/definitions/uint32 + default: 3072000 + + '#sound-dai-cells': + const: 0 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/interrupt-controller/irq.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + codec@1b { + #sound-dai-cells = <0>; + compatible = "nuvoton,nau8821"; + reg = <0x1b>; + interrupt-parent = <&gpio>; + interrupts = <23 IRQ_TYPE_LEVEL_LOW>; + nuvoton,jkdet-enable; + nuvoton,jkdet-pull-enable; + nuvoton,jkdet-pull-up; + nuvoton,jkdet-polarity = <GPIO_ACTIVE_LOW>; + nuvoton,micbias-voltage = <6>; + nuvoton,vref-impedance = <2>; + nuvoton,jack-insert-debounce = <7>; + nuvoton,jack-eject-debounce = <0>; + nuvoton,dmic-clk-threshold = <3072000>; + }; + }; -- 2.25.1

3 2

[PATCH v2] soundwire: amd: Fix a check for errors in probe()
by Dan Carpenter 10 Jul '23

10 Jul '23

This code has two problems: 1) The devm_ioremap() function returns NULL, not error pointers. 2) It's checking the wrong variable. ->mmio instead of ->acp_mmio. Fixes: a673a8dfc214 ("soundwire: amd: Add support for AMD Manager driver") Suggested-by: "Mukunda,Vijendar" <vijendar.mukunda(a)amd.com> Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- v2: Change the variable. My original fix would have prevented the driver from loading so many thanks to Vijendar for pointing that out. drivers/soundwire/amd_manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 08aeb7ed00e1..3a99f6dcdfaf 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -910,9 +910,9 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) return -ENOMEM; amd_manager->acp_mmio = devm_ioremap(dev, res->start, resource_size(res)); - if (IS_ERR(amd_manager->mmio)) { + if (!amd_manager->acp_mmio) { dev_err(dev, "mmio not found\n"); - return PTR_ERR(amd_manager->mmio); + return -ENOMEM; } amd_manager->instance = pdata->instance; amd_manager->mmio = amd_manager->acp_mmio + -- 2.39.2

2 1

[PATCH v2 0/4] soundwire: qcom: stablity fixes
by Srinivas Kandagatla 10 Jul '23

10 Jul '23

During x13s audio testing we hit few corner cases due to issues in codec drivers and some obvious code bugs. Here are the fixes for those issues, mostly the issues are around devices loosing the sync in between runtime pm suspend resume path. With codec fixes along with these fixes, audio on x13s is pretty stable. Thanks, Srini Changes since v1: - dropped runtime pm changes patch as unable to reproduced it anymore - fixed clk stop flag as suggested by Pierre - rebased on top of linux-next Srinivas Kandagatla (4): soundwire: qcom: update status correctly with mask soundwire: qcom: wait for fifo to be empty before suspend soundwire: qcom: add software workaround for bus clash interrupt assertion soundwire: qcom: set clk stop need reset flag at runtime drivers/soundwire/qcom.c | 100 ++++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 32 deletions(-) -- 2.21.0

3 13

[PATCH] ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master mode
by Shengjiu Wang 07 Jul '23

07 Jul '23

On i.MX8MM, the MCTL_MCLK_EN bit it is not only the gate for MCLK output to PAD, but also the gate bit between root clock and SAI module, So it is need to be enabled for master mode, otherwise there is no bclk generated. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_sai.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index fa950dde5310..dae16a14f177 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -437,6 +437,12 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq) FSL_SAI_CR2_DIV_MASK | FSL_SAI_CR2_BYP, savediv / 2 - 1); + if (sai->soc_data->max_register >= FSL_SAI_MCTL) { + /* SAI is in master mode at this point, so enable MCLK */ + regmap_update_bits(sai->regmap, FSL_SAI_MCTL, + FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN); + } + return 0; } -- 2.17.1

5 4

[PATCH v3 0/6] Introduce STM32 system bus
by Gatien Chevallier 05 Jul '23

05 Jul '23

Document STM32 System Bus. This bus is intended to control firewall access for the peripherals connected to it. For every peripheral, the bus checks the firewall registers to see if the peripheral is configured as non-secure. If the peripheral is configured as secure, the node is marked populated, so the device won't be probed. This is useful as a firewall configuration sanity check and avoid platform crashes in case peripherals are incorrectly configured. The STM32 System Bus implements the feature-domain-controller bindings. It is used by peripherals to reference a domain controller, in this case the firewall feature domain. The bus uses the ID referenced by the feature-domains property to know where to look in the firewall to get the security configuration for the peripheral. This allows a device tree description rather than a hardcoded peripheral table in the bus driver. On STM32MP13/15 platforms, the firewall bus is represented by the ETZPC node, which is responsible for the securing / MCU isolating the capable peripherals. STM32MP13/15 device trees are updated in this series to implement the bus. All peripherals that are securable or MCU isolation capable by the ETZPC are connected to the bus. Changes in V2: - Corrected YAMLS errors highlighted by Rob's robot - Re-ordered Signed-off-by tags in two patches Changes in V3: - Document feature-domains property in YAML documentation for concerned periperals under the System Bus - Fix STM32 System Bus YAML documentation - Remove STM32 System bus bindings that were currently used as helpers for device tree - Correct few errors in driver - Add missing peripherals under the System Bus that were in SoC variation device tree files - Fix node names Gatien Chevallier (5): dt-bindings: treewide: add feature-domains description in binding files dt-bindings: bus: add STM32 System Bus bus: stm32_sys_bus: add support for STM32MP15 and STM32MP13 system bus ARM: dts: stm32: add ETZPC as a system bus for STM32MP15x boards ARM: dts: stm32: add ETZPC as a system bus for STM32MP13x boards Oleksii Moisieiev (1): dt-bindings: Document common device controller bindings .../devicetree/bindings/bus/st,sys-bus.yaml | 127 + .../bindings/crypto/st,stm32-hash.yaml | 5 + .../devicetree/bindings/dma/st,stm32-dma.yaml | 5 + .../bindings/dma/st,stm32-dmamux.yaml | 5 + .../feature-domain-controller.yaml | 84 + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 5 + .../bindings/iio/adc/st,stm32-adc.yaml | 5 + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 5 + .../bindings/iio/dac/st,stm32-dac.yaml | 5 + .../bindings/media/st,stm32-cec.yaml | 5 + .../bindings/media/st,stm32-dcmi.yaml | 5 + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 5 + .../bindings/mfd/st,stm32-lptimer.yaml | 5 + .../bindings/mfd/st,stm32-timers.yaml | 6 + .../devicetree/bindings/mmc/arm,pl18x.yaml | 5 + .../devicetree/bindings/net/stm32-dwmac.yaml | 5 + .../bindings/phy/phy-stm32-usbphyc.yaml | 5 + .../bindings/regulator/st,stm32-vrefbuf.yaml | 5 + .../devicetree/bindings/rng/st,stm32-rng.yaml | 5 + .../bindings/serial/st,stm32-uart.yaml | 5 + .../bindings/sound/st,stm32-i2s.yaml | 5 + .../bindings/sound/st,stm32-sai.yaml | 5 + .../bindings/sound/st,stm32-spdifrx.yaml | 5 + .../bindings/spi/st,stm32-qspi.yaml | 5 + .../devicetree/bindings/spi/st,stm32-spi.yaml | 5 + .../devicetree/bindings/usb/dwc2.yaml | 5 + MAINTAINERS | 6 + arch/arm/boot/dts/stm32mp131.dtsi | 407 +-- arch/arm/boot/dts/stm32mp133.dtsi | 51 +- arch/arm/boot/dts/stm32mp13xc.dtsi | 19 +- arch/arm/boot/dts/stm32mp13xf.dtsi | 18 +- arch/arm/boot/dts/stm32mp151.dtsi | 2722 +++++++++-------- arch/arm/boot/dts/stm32mp153.dtsi | 52 +- arch/arm/boot/dts/stm32mp15xc.dtsi | 19 +- drivers/bus/Kconfig | 9 + drivers/bus/Makefile | 1 + drivers/bus/stm32_sys_bus.c | 168 + 37 files changed, 2208 insertions(+), 1596 deletions(-) create mode 100644 Documentation/devicetree/bindings/bus/st,sys-bus.yaml create mode 100644 Documentation/devicetree/bindings/feature-controllers/feature-domain-controller.yaml create mode 100644 drivers/bus/stm32_sys_bus.c -- 2.35.3

7 23

[PATCH v2 0/7] ASoC: mediatek: Add support for MT7986 SoC
by Maso Huang 04 Jul '23

04 Jul '23

Changes in v2: - v1 title: [PATCH 0/7] ASoC: mediatek: Add support for MT79xx SoC - add missing maintainers - rename mt79xx to mt7986 in all files - use clk bulk api in mt7986-afe-clk.c [2/7] - refine mt7986-afe-pcm.c based on reviewer's suggestions [4/7] - refine dt-binding files based on reviewer's suggestions [6/7] [7/7] - transpose [3/7] and [4/7] in v1 to fix test build errors This series of patches adds support for MediaTek AFE of MT7986 SoC. Patches are based on broonie tree "for-next" branch. Maso Huang (7): ASoC: mediatek: mt7986: add common header ASoC: mediatek: mt7986: support audio clock control ASoC: mediatek: mt7986: support etdm in platform driver ASoC: mediatek: mt7986: add platform driver ASoC: mediatek: mt7986: add machine driver with wm8960 ASoC: dt-bindings: mediatek,mt7986-wm8960: add mt7986-wm8960 document ASoC: dt-bindings: mediatek,mt7986-afe: add audio afe document .../bindings/sound/mediatek,mt7986-afe.yaml | 89 +++ .../sound/mediatek,mt7986-wm8960.yaml | 53 ++ sound/soc/mediatek/Kconfig | 20 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/mt7986/Makefile | 10 + sound/soc/mediatek/mt7986/mt7986-afe-clk.c | 75 +++ sound/soc/mediatek/mt7986/mt7986-afe-clk.h | 18 + sound/soc/mediatek/mt7986/mt7986-afe-common.h | 51 ++ sound/soc/mediatek/mt7986/mt7986-afe-pcm.c | 598 ++++++++++++++++++ sound/soc/mediatek/mt7986/mt7986-dai-etdm.c | 421 ++++++++++++ sound/soc/mediatek/mt7986/mt7986-reg.h | 206 ++++++ sound/soc/mediatek/mt7986/mt7986-wm8960.c | 184 ++++++ 12 files changed, 1726 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt7986-afe.yaml create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt7986-wm8960.yaml create mode 100644 sound/soc/mediatek/mt7986/Makefile create mode 100644 sound/soc/mediatek/mt7986/mt7986-afe-clk.c create mode 100644 sound/soc/mediatek/mt7986/mt7986-afe-clk.h create mode 100644 sound/soc/mediatek/mt7986/mt7986-afe-common.h create mode 100644 sound/soc/mediatek/mt7986/mt7986-afe-pcm.c create mode 100644 sound/soc/mediatek/mt7986/mt7986-dai-etdm.c create mode 100644 sound/soc/mediatek/mt7986/mt7986-reg.h create mode 100644 sound/soc/mediatek/mt7986/mt7986-wm8960.c -- 2.18.0

4 15

[PATCH] ASoC: mediatek: mt8188: add constraints for PCM
by Trevor Wu 04 Jul '23

04 Jul '23

For certain projects, only a limited number of parameters are necessary. Therefore, it may be beneficial to add constraints that restrict the capacity of the PCM. Signed-off-by: Trevor Wu <trevor.wu(a)mediatek.com> --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 145 +++++++++++++++++++++- 1 file changed, 144 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index ac69c23e0da1..0e4e1b8c99e2 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -30,6 +30,7 @@ #define TEST_MISO_DONE_2 BIT(29) #define NAU8825_HS_PRESENT BIT(0) +#define DPCM_FE_CONSTRAINT BIT(16) /* * Maxim MAX98390 @@ -452,6 +453,143 @@ enum { DAI_LINK_UL_SRC_BE, }; +static int mt8188_playback_startup(struct snd_pcm_substream *substream) +{ + static const unsigned int rates[] = { + 48000 + }; + static const unsigned int channels[] = { + 2 + }; + static const struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates), + .list = rates, + .mask = 0, + }; + static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, + }; + + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct mt8188_card_data *data = (struct mt8188_card_data *)priv->private_data; + int ret; + + if (!(data->quirk & DPCM_FE_CONSTRAINT)) + return 0; + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list rate failed\n"); + return ret; + } + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list channel failed\n"); + return ret; + } + + return 0; +} + +static const struct snd_soc_ops mt8188_playback_ops = { + .startup = mt8188_playback_startup, +}; + +static int mt8188_capture_startup(struct snd_pcm_substream *substream) +{ + static const unsigned int rates[] = { + 48000 + }; + static const struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates), + .list = rates, + .mask = 0, + }; + + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct mt8188_card_data *data = (struct mt8188_card_data *)priv->private_data; + int ret; + + if (!(data->quirk & DPCM_FE_CONSTRAINT)) + return 0; + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list rate failed\n"); + return ret; + } + + return 0; +} + +static const struct snd_soc_ops mt8188_capture_ops = { + .startup = mt8188_capture_startup, +}; + +static int mt8188_hdmi_dptx_startup(struct snd_pcm_substream *substream) +{ + static const unsigned int rates[] = { + 48000 + }; + static const unsigned int channels[] = { + 2, 4, 6, 8 + }; + static const struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates), + .list = rates, + .mask = 0, + }; + static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, + }; + + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct mt8188_card_data *data = (struct mt8188_card_data *)priv->private_data; + int ret; + + if (!(data->quirk & DPCM_FE_CONSTRAINT)) + return 0; + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list rate failed\n"); + return ret; + } + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list channel failed\n"); + return ret; + } + + return 0; +} + +static const struct snd_soc_ops mt8188_hdmi_dptx_playback_ops = { + .startup = mt8188_hdmi_dptx_startup, +}; + static int mt8188_dptx_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -723,6 +861,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { }, .dynamic = 1, .dpcm_playback = 1, + .ops = &mt8188_playback_ops, SND_SOC_DAILINK_REG(playback2), }, [DAI_LINK_DL3_FE] = { @@ -734,6 +873,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { }, .dynamic = 1, .dpcm_playback = 1, + .ops = &mt8188_playback_ops, SND_SOC_DAILINK_REG(playback3), }, [DAI_LINK_DL6_FE] = { @@ -778,6 +918,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { }, .dynamic = 1, .dpcm_playback = 1, + .ops = &mt8188_hdmi_dptx_playback_ops, SND_SOC_DAILINK_REG(playback10), }, [DAI_LINK_DL11_FE] = { @@ -833,6 +974,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { }, .dynamic = 1, .dpcm_capture = 1, + .ops = &mt8188_capture_ops, SND_SOC_DAILINK_REG(capture4), }, [DAI_LINK_UL5_FE] = { @@ -844,6 +986,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { }, .dynamic = 1, .dpcm_capture = 1, + .ops = &mt8188_capture_ops, SND_SOC_DAILINK_REG(capture5), }, [DAI_LINK_UL6_FE] = { @@ -1122,7 +1265,7 @@ static struct mt8188_card_data mt8188_evb_card = { static struct mt8188_card_data mt8188_nau8825_card = { .name = "mt8188_nau8825", - .quirk = NAU8825_HS_PRESENT, + .quirk = NAU8825_HS_PRESENT | DPCM_FE_CONSTRAINT, }; static const struct of_device_id mt8188_mt6359_dt_match[] = { -- 2.18.0

4 5

[PATCH 0/5] ASoC: codecs: wcd938x/wcd934x: loglevel fix and cleanups
by Johan Hovold 03 Jul '23

03 Jul '23

When investigating a race in the wcd938x driver I noticed that the MBHC impedance measurements where printed at error loglevel which is clearly wrong. Fix that, and clean up the logging somewhat by using dev_printk() and addressing some style issues. Included are also two patches that drop the bogus inline keywords from the functions involved. Johan Johan Hovold (5): ASoC: codecs: wcd938x: fix mbhc impedance loglevel ASoC: codecs: wcd938x: drop inline keywords ASoC: codecs: wcd938x: use dev_printk() for impedance logging ASoC: codecs: wcd934x: demote impedance printk loglevel ASoC: codecs: wcd934x: drop inline keywords sound/soc/codecs/wcd934x.c | 8 ++++---- sound/soc/codecs/wcd938x.c | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) -- 2.39.3

3 9

[PATCH] ASoC: qdsp6: q6apm: use dai link pcm id as pcm device number
by Srinivas Kandagatla 03 Jul '23

03 Jul '23

For some reason we ended up with a setup without this flag. This resulted in inconsistent sound card devices numbers which are also not starting as expected at dai_link->id. (Ex: MultiMedia1 pcm ended up with device number 4 instead of 0) With this patch patch now the MultiMedia1 PCM ends up with device number 0 as expected. Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support") Cc: <Stable(a)vger.kernel.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/qdsp6/q6apm-dai.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index 5eb0b864c740..c90db6daabbd 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -840,6 +840,7 @@ static const struct snd_soc_component_driver q6apm_fe_dai_component = { .pointer = q6apm_dai_pointer, .trigger = q6apm_dai_trigger, .compress_ops = &q6apm_dai_compress_ops, + .use_dai_pcm_id = true, }; static int q6apm_dai_probe(struct platform_device *pdev) -- 2.21.0

5 17