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

Behringer UV1 needs modified USB-Audio.pcm.iec958_device index
by Andy Bailey 20 Jan '23

20 Jan '23

I recently purchased a Behringer UV1 USB Channel strip interface and found that the Analog Stereo Duplex profile using Pipewire+ALSA would work as a source but not an output, but if I selected the IEC958 Profile, everything works fine. Indeed, the device has no digital outs, so I modified /usr/share/alsa/cards/USB-Audio.conf setting the iec958 index to 999, and now the Analog Stereo Duplex profile is working nicely. I'm not sure whether "Behringer UV1" or "UV1" is the correct card string so I've uploaded my alsa-info output with id f4314b25c46bf1f9aa35231aad198db6723bec17. Thanks!! -- .andy

1 0

[PATCH] dt-bindings: sound: audio-graph-port: Add capture and playback
by Michał Grzelak 20 Jan '23

20 Jan '23

Running 'make DT_SCHEMA_FILES=renesas,rsnd.yaml dt_binding_check' gives following warning: bindings/sound/renesas,rsnd.example.dtb: sound@ec500000: port:endpoint: Unevaluated properties are not allowed ('capture', 'playback' were unexpected) From schema: bindings/sound/renesas,rsnd.yaml Running 'make ARCH=arm64 DT_SCHEMA_FILES=renesas,rsnd.yaml dtbs_check' gives 140 warnings presented under tag [WARNINGS]. Fix all of them by allowing capture and playback in subnode 'endpoint' in sound/audio-graph-port.yaml. While editing audio-graph-port.yaml, drop quotes after referencing some schemas. Regarding files referencing audio-graph-port.yaml, no new errors were observed after applying this change, tested with DT_SCHEMA_FILES set to: marvell,mmp-sspa.yaml nvidia,tegra186-asrc.yaml nvidia,tegra186-dspk.yaml nvidia,tegra210-admaif.yaml nvidia,tegra210-adx.yaml nvidia,tegra210-ahub.yaml nvidia,tegra210-amx.yaml nvidia,tegra210-dmic.yaml nvidia,tegra210-i2s.yaml nvidia,tegra210-mixer.yaml nvidia,tegra210-mvc.yaml nvidia,tegra210-ope.yaml nvidia,tegra210-sfc.yaml renesas,rsnd.yaml sgtl5000.yaml socionext,uniphier-aio.yaml socionext,uniphier-evea.yaml st,stm32-sai.yaml wlf,wm8962.yaml [WARNINGS]: sound@ec500000: ports:port:endpoint: Unevaluated properties are not allowed ('capture', 'playback' were unexpected) arch/arm64/boot/dts/renesas/r8a77995-draak.dtb sound@ec500000: ports:port@0:endpoint: Unevaluated properties are not allowed ('capture', 'playback' were unexpected) arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dtb arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dtb arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77950-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb.dtb arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dtb arch/arm64/boot/dts/renesas/r8a779m3-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dtb arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dtb sound@ec500000: ports:port@1:endpoint: Unevaluated properties are not allowed ('playback' was unexpected) arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dtb arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dtb arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77950-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m3-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dtb sound@ec500000: ports:port@2:endpoint: Unevaluated properties are not allowed ('playback' was unexpected) arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dtb sound@ec500000: ports:port@3:endpoint: Unevaluated properties are not allowed ('capture' was unexpected) arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dtb sound@ec500000: port:endpoint: Unevaluated properties are not allowed ('playback' was unexpected) arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dtb sound@ec500000: Unevaluated properties are not allowed ('ports' was unexpected) arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dtb arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dtb arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dtb arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77950-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dtb arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb.dtb arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a77995-draak.dtb arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dtb arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m3-salvator-xs.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dtb arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dtb arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dtb sound@ec500000: Unevaluated properties are not allowed ('port' was unexpected) arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dtb arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-idk-1110wr.dtb arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dtb >From schema: bindings/sound/renesas,rsnd.yaml Signed-off-by: Michał Grzelak <mchl.grzlk(a)gmail.com> --- .../bindings/sound/audio-graph-port.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index f5b8b6d13077..4238128eb52e 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -19,11 +19,11 @@ properties: description: "device name prefix" $ref: /schemas/types.yaml#/definitions/string convert-rate: - $ref: "/schemas/sound/dai-params.yaml#/$defs/dai-sample-rate" + $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate convert-channels: - $ref: "/schemas/sound/dai-params.yaml#/$defs/dai-channels" + $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels convert-sample-format: - $ref: "/schemas/sound/dai-params.yaml#/$defs/dai-sample-format" + $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format patternProperties: "^endpoint(@[0-9a-f]+)?": @@ -67,12 +67,16 @@ patternProperties: - pdm - msb - lsb + playback: + $ref: /schemas/types.yaml#/definitions/phandle-array + capture: + $ref: /schemas/types.yaml#/definitions/phandle-array convert-rate: - $ref: "/schemas/sound/dai-params.yaml#/$defs/dai-sample-rate" + $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate convert-channels: - $ref: "/schemas/sound/dai-params.yaml#/$defs/dai-channels" + $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels convert-sample-format: - $ref: "/schemas/sound/dai-params.yaml#/$defs/dai-sample-format" + $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format dai-tdm-slot-num: description: Number of slots in use. -- 2.37.3

1 0

[PATCH 1/5] ASoC: samsung: remove DMA filter function and data
by Arnd Bergmann 20 Jan '23

20 Jan '23

From: Arnd Bergmann <arnd(a)arndb.de> This data is no longer passed by the platform code, so there is no point passing it down at all. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- include/linux/platform_data/asoc-s3c.h | 6 ------ sound/soc/samsung/dma.h | 2 +- sound/soc/samsung/dmaengine.c | 3 +-- sound/soc/samsung/i2s.c | 21 +++------------------ sound/soc/samsung/pcm.c | 11 +---------- sound/soc/samsung/spdif.c | 9 +-------- 6 files changed, 7 insertions(+), 45 deletions(-) diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h index f9c00f839e9f..84874433cf21 100644 --- a/include/linux/platform_data/asoc-s3c.h +++ b/include/linux/platform_data/asoc-s3c.h @@ -30,7 +30,6 @@ struct samsung_i2s_type { #define QUIRK_SUPPORTS_IDMA (1 << 5) /* Quirks of the I2S controller */ u32 quirks; - dma_addr_t idma_addr; }; /** @@ -39,10 +38,5 @@ struct samsung_i2s_type { */ struct s3c_audio_pdata { int (*cfg_gpio)(struct platform_device *); - dma_filter_fn dma_filter; - void *dma_playback; - void *dma_capture; - void *dma_play_sec; - void *dma_capture_mic; struct samsung_i2s_type type; }; diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h index 7b5d4556e0fd..bd0faf84972e 100644 --- a/sound/soc/samsung/dma.h +++ b/sound/soc/samsung/dma.h @@ -12,7 +12,7 @@ * @tx, @rx arguments can be NULL if the DMA channel names are "tx", "rx", * otherwise actual DMA channel names must be passed to this function. */ -int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, +int samsung_asoc_dma_platform_register(struct device *dev, const char *tx, const char *rx, struct device *dma_dev); #endif /* _SAMSUNG_DMA_H */ diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c index 2802789a323e..900953ee3786 100644 --- a/sound/soc/samsung/dmaengine.c +++ b/sound/soc/samsung/dmaengine.c @@ -14,7 +14,7 @@ #include "dma.h" -int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, +int samsung_asoc_dma_platform_register(struct device *dev, const char *tx, const char *rx, struct device *dma_dev) { @@ -25,7 +25,6 @@ int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, return -ENOMEM; pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; - pcm_conf->compat_filter_fn = filter; pcm_conf->dma_dev = dma_dev; pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx; diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 9505200f3d11..052c263c126a 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -79,7 +79,6 @@ struct i2s_dai { struct snd_dmaengine_dai_dma_data dma_playback; struct snd_dmaengine_dai_dma_data dma_capture; struct snd_dmaengine_dai_dma_data idma_playback; - dma_filter_fn filter; struct samsung_i2s_priv *priv; }; @@ -1431,13 +1430,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) spin_lock_init(&priv->lock); spin_lock_init(&priv->pcm_lock); - if (!np) { - pri_dai->dma_playback.filter_data = i2s_pdata->dma_playback; - pri_dai->dma_capture.filter_data = i2s_pdata->dma_capture; - pri_dai->filter = i2s_pdata->dma_filter; - - idma_addr = i2s_pdata->type.idma_addr; - } else { + if (np) { if (of_property_read_u32(np, "samsung,idma-addr", &idma_addr)) { if (priv->quirks & QUIRK_SUPPORTS_IDMA) { @@ -1475,8 +1468,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (priv->quirks & QUIRK_PRI_6CHAN) pri_dai->drv->playback.channels_max = 6; - ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter, - "tx", "rx", NULL); + ret = samsung_asoc_dma_platform_register(&pdev->dev, "tx", "rx", NULL); if (ret < 0) goto err_disable_clk; @@ -1485,12 +1477,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) sec_dai->dma_playback.addr = regs_base + I2STXDS; sec_dai->dma_playback.chan_name = "tx-sec"; - - if (!np) { - sec_dai->dma_playback.filter_data = i2s_pdata->dma_play_sec; - sec_dai->filter = i2s_pdata->dma_filter; - } - sec_dai->dma_playback.addr_width = 4; sec_dai->idma_playback.addr = idma_addr; sec_dai->pri_dai = pri_dai; @@ -1502,8 +1488,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) goto err_disable_clk; ret = samsung_asoc_dma_platform_register(&priv->pdev_sec->dev, - sec_dai->filter, "tx-sec", NULL, - &pdev->dev); + "tx-sec", NULL, &pdev->dev); if (ret < 0) goto err_del_sec; diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index e859252ae5e6..2f3a99de6434 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -489,7 +489,6 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) struct s3c_pcm_info *pcm; struct resource *mem_res; struct s3c_audio_pdata *pcm_pdata; - dma_filter_fn filter; int ret; /* Check for valid device index */ @@ -542,18 +541,10 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) s3c_pcm_stereo_in[pdev->id].addr = mem_res->start + S3C_PCM_RXFIFO; s3c_pcm_stereo_out[pdev->id].addr = mem_res->start + S3C_PCM_TXFIFO; - filter = NULL; - if (pcm_pdata) { - s3c_pcm_stereo_in[pdev->id].filter_data = pcm_pdata->dma_capture; - s3c_pcm_stereo_out[pdev->id].filter_data = pcm_pdata->dma_playback; - filter = pcm_pdata->dma_filter; - } - pcm->dma_capture = &s3c_pcm_stereo_in[pdev->id]; pcm->dma_playback = &s3c_pcm_stereo_out[pdev->id]; - ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, - NULL, NULL, NULL); + ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); goto err_dis_pclk; diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 7d815e237e5c..beabcadd7d1d 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -363,7 +363,6 @@ static int spdif_probe(struct platform_device *pdev) struct s3c_audio_pdata *spdif_pdata; struct resource *mem_res; struct samsung_spdif_info *spdif; - dma_filter_fn filter; int ret; spdif_pdata = pdev->dev.platform_data; @@ -424,15 +423,9 @@ static int spdif_probe(struct platform_device *pdev) spdif_stereo_out.addr_width = 2; spdif_stereo_out.addr = mem_res->start + DATA_OUTBUF; - filter = NULL; - if (spdif_pdata) { - spdif_stereo_out.filter_data = spdif_pdata->dma_playback; - filter = spdif_pdata->dma_filter; - } spdif->dma_playback = &spdif_stereo_out; - ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, - NULL, NULL, NULL); + ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); goto err4; -- 2.39.0

5 13

[PATCH] ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure
by Peter Ujfalusi 20 Jan '23

20 Jan '23

If the swidget is NULL we skip the preparing of the widget and jump to handle the sink path of the widget. If the prepare fails in this case we would undo the prepare but the swidget is NULL (we skipped the prepare for the widget). To avoid NULL pointer dereference in this case we must check swidget against NULL pointer once again. Fixes: 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL") Reported-by: kernel test robot <lkp(a)intel.com> Reported-by: Dan Carpenter <error27(a)gmail.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/sof-audio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index f17d405a9da9..2dff3ae25d27 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -334,7 +334,8 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget p->walking = false; if (ret < 0) { /* unprepare the source widget */ - if (widget_ops[widget->id].ipc_unprepare && swidget->prepared) { + if (widget_ops[widget->id].ipc_unprepare && + swidget && swidget->prepared) { widget_ops[widget->id].ipc_unprepare(swidget); swidget->prepared = false; } -- 2.39.0

3 2

[PATCH 19/27] mfd: remove ucb1400 support
by Arnd Bergmann 20 Jan '23

20 Jan '23

From: Arnd Bergmann <arnd(a)arndb.de> The ucb1400 MFD driver and its gpio and touchscreen child drivers were only used on a few PXA machines that were unused for a while and are now removed. Removing these leaves the AC97 support as ALSA specific, no other drivers are now connected through this interface. Cc: Linus Walleij <linus.walleij(a)linaro.org> Cc: Bartosz Golaszewski <brgl(a)bgdev.pl> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Lee Jones <lee(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Marek Vasut <marex(a)denx.de> Cc: linux-kernel(a)vger.kernel.org Cc: linux-gpio(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/gpio/Kconfig | 7 - drivers/gpio/Makefile | 1 - drivers/gpio/gpio-ucb1400.c | 85 ----- drivers/input/touchscreen/Kconfig | 16 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/ucb1400_ts.c | 458 ------------------------- drivers/mfd/Kconfig | 11 - drivers/mfd/Makefile | 1 - drivers/mfd/ucb1400_core.c | 158 --------- include/linux/ucb1400.h | 160 --------- sound/Kconfig | 1 - sound/pci/ac97/ac97_codec.c | 1 - sound/pci/ac97/ac97_patch.c | 40 --- 13 files changed, 940 deletions(-) delete mode 100644 drivers/gpio/gpio-ucb1400.c delete mode 100644 drivers/input/touchscreen/ucb1400_ts.c delete mode 100644 drivers/mfd/ucb1400_core.c delete mode 100644 include/linux/ucb1400.h diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 0148553790eb..df2dfbb2601e 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1428,13 +1428,6 @@ config GPIO_TWL6040 Say yes here to access the GPO signals of twl6040 audio chip from Texas Instruments. -config GPIO_UCB1400 - tristate "Philips UCB1400 GPIO" - depends on UCB1400_CORE - help - This enables support for the Philips UCB1400 GPIO pins. - The UCB1400 is an AC97 audio codec. - config GPIO_WHISKEY_COVE tristate "GPIO support for Whiskey Cove PMIC" depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC_BXTWC diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 59ac21054261..c048ba003367 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -165,7 +165,6 @@ obj-$(CONFIG_GPIO_TS4900) += gpio-ts4900.o obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o -obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o obj-$(CONFIG_GPIO_VF610) += gpio-vf610.o obj-$(CONFIG_GPIO_VIPERBOARD) += gpio-viperboard.o diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c deleted file mode 100644 index 676adf1f198a..000000000000 diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index ca00f55eaf45..1a2049b336a6 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -827,22 +827,6 @@ config TOUCHSCREEN_TI_AM335X_TSC To compile this driver as a module, choose M here: the module will be called ti_am335x_tsc. -config TOUCHSCREEN_UCB1400 - tristate "Philips UCB1400 touchscreen" - depends on AC97_BUS - depends on UCB1400_CORE - help - This enables support for the Philips UCB1400 touchscreen interface. - The UCB1400 is an AC97 audio codec. The touchscreen interface - will be initialized only after the ALSA subsystem has been - brought up and the UCB1400 detected. You therefore have to - configure ALSA support as well (either built-in or modular, - independently of whether this driver is itself built-in or - modular) for this driver to work. - - To compile this driver as a module, choose M here: the - module will be called ucb1400_ts. - config TOUCHSCREEN_PIXCIR tristate "PIXCIR I2C touchscreens" depends on I2C diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 7053fede594e..f2fd28cc34a6 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -97,7 +97,6 @@ obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o tsc2007-y := tsc2007_core.o tsc2007-$(CONFIG_TOUCHSCREEN_TSC2007_IIO) += tsc2007_iio.o obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o -obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o obj-$(CONFIG_TOUCHSCREEN_WACOM_I2C) += wacom_i2c.o obj-$(CONFIG_TOUCHSCREEN_WDT87XX_I2C) += wdt87xx_i2c.o diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c deleted file mode 100644 index dfd3b35590c3..000000000000 diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index da57ebf22630..5ea07a65f150 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1071,17 +1071,6 @@ config PCF50633_GPIO Say yes here if you want to include support GPIO for pins on the PCF50633 chip. -config UCB1400_CORE - tristate "Philips UCB1400 Core driver" - depends on AC97_BUS - depends on GPIOLIB - help - This enables support for the Philips UCB1400 core functions. - The UCB1400 is an AC97 audio codec. - - To compile this driver as a module, choose M here: the - module will be called ucb1400_core. - config MFD_PM8XXX tristate "Qualcomm PM8xxx PMIC chips driver" depends on (ARM || HEXAGON || COMPILE_TEST) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 9ba9d711c492..4969ea6e24f1 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -127,7 +127,6 @@ obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o ifeq ($(CONFIG_SA1100_ASSABET),y) obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o endif -obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o obj-$(CONFIG_PMIC_DA903X) += da903x.o diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c deleted file mode 100644 index ac1d18039568..000000000000 diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h deleted file mode 100644 index 2516082cd3a9..000000000000 diff --git a/sound/Kconfig b/sound/Kconfig index e56d96d2b11c..0ddfb717b81d 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -107,7 +107,6 @@ endif # !UML endif # SOUND -# AC97_BUS is used from both sound and ucb1400 config AC97_BUS tristate help diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index ff685321f1a1..9afc5906d662 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -152,7 +152,6 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x4e534300, 0xffffffff, "LM4540,43,45,46,48", NULL, NULL }, // only guess --jk { 0x4e534331, 0xffffffff, "LM4549", NULL, NULL }, { 0x4e534350, 0xffffffff, "LM4550", patch_lm4550, NULL }, // volume wrap fix -{ 0x50534304, 0xffffffff, "UCB1400", patch_ucb1400, NULL }, { 0x53494c20, 0xffffffe0, "Si3036,8", mpatch_si3036, mpatch_si3036, AC97_MODEM_PATCH }, { 0x53544d02, 0xffffffff, "ST7597", NULL, NULL }, { 0x54524102, 0xffffffff, "TR28022", NULL, NULL }, diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 025c1666c1fc..4b5f33de70d5 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -3937,43 +3937,3 @@ static int patch_lm4550(struct snd_ac97 *ac97) ac97->res_table = lm4550_restbl; return 0; } - -/* - * UCB1400 codec (http://www.semiconductors.philips.com/acrobat_download/datasheets/UCB1400-0…) - */ -static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = { -/* enable/disable headphone driver which allows direct connection to - stereo headphone without the use of external DC blocking - capacitors */ -AC97_SINGLE("Headphone Driver", 0x6a, 6, 1, 0), -/* Filter used to compensate the DC offset is added in the ADC to remove idle - tones from the audio band. */ -AC97_SINGLE("DC Filter", 0x6a, 4, 1, 0), -/* Control smart-low-power mode feature. Allows automatic power down - of unused blocks in the ADC analog front end and the PLL. */ -AC97_SINGLE("Smart Low Power Mode", 0x6c, 4, 3, 0), -}; - -static int patch_ucb1400_specific(struct snd_ac97 * ac97) -{ - int idx, err; - for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_ucb1400); idx++) { - err = snd_ctl_add(ac97->bus->card, snd_ctl_new1(&snd_ac97_controls_ucb1400[idx], ac97)); - if (err < 0) - return err; - } - return 0; -} - -static const struct snd_ac97_build_ops patch_ucb1400_ops = { - .build_specific = patch_ucb1400_specific, -}; - -static int patch_ucb1400(struct snd_ac97 * ac97) -{ - ac97->build_ops = &patch_ucb1400_ops; - /* enable headphone driver and smart low power mode by default */ - snd_ac97_write_cache(ac97, 0x6a, 0x0050); - snd_ac97_write_cache(ac97, 0x6c, 0x0030); - return 0; -} -- 2.39.0

3 3

[PATCH] ASoC: hdmi-codec: zero clear HDMI pdata
by Kuninori Morimoto 20 Jan '23

20 Jan '23

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit f77a066f4ed307d ("ASoC: hdmi-codec: Allow playback and capture to be disabled") added new no_i2s_playback/capture. We need to zero clear HDMI pdata first, otherwise unexpected flag will be added. Fixes: f77a066f4ed3 ("ASoC: hdmi-codec: Allow playback and capture to be disabled") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- > Mark This is for v6.2-rcX drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index a2f0860b20bb..d751820c6da6 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -193,6 +193,7 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev) struct hdmi_codec_pdata pdata; struct platform_device *platform; + memset(&pdata, 0, sizeof(pdata)); pdata.ops = &dw_hdmi_i2s_ops; pdata.i2s = 1; pdata.max_i2s_channels = 8; -- 2.25.1

2 1

[PATCH] ASoC: SOF: ipc4-mtrace: prevent underflow in sof_ipc4_priority_mask_dfs_write()
by Dan Carpenter 20 Jan '23

20 Jan '23

The "id" comes from the user. Change the type to unsigned to prevent an array underflow. Fixes: f4ea22f7aa75 ("ASoC: SOF: ipc4: Add support for mtrace log extraction") Signed-off-by: Dan Carpenter <error27(a)gmail.com> --- sound/soc/sof/ipc4-mtrace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/ipc4-mtrace.c b/sound/soc/sof/ipc4-mtrace.c index 70dea8ae706e..0ec6ef681012 100644 --- a/sound/soc/sof/ipc4-mtrace.c +++ b/sound/soc/sof/ipc4-mtrace.c @@ -344,9 +344,10 @@ static ssize_t sof_ipc4_priority_mask_dfs_write(struct file *file, size_t count, loff_t *ppos) { struct sof_mtrace_priv *priv = file->private_data; - int id, ret; + unsigned int id; char *buf; u32 mask; + int ret; /* * To update Nth mask entry, write: @@ -357,9 +358,9 @@ static ssize_t sof_ipc4_priority_mask_dfs_write(struct file *file, if (IS_ERR(buf)) return PTR_ERR(buf); - ret = sscanf(buf, "%d,0x%x", &id, &mask); + ret = sscanf(buf, "%u,0x%x", &id, &mask); if (ret != 2) { - ret = sscanf(buf, "%d,%x", &id, &mask); + ret = sscanf(buf, "%u,%x", &id, &mask); if (ret != 2) { ret = -EINVAL; goto out; -- 2.35.1

3 2

[PATCH 0/4] ASoC: Intel: set dpcm_capture for amps
by Kai Vehmanen 20 Jan '23

20 Jan '23

This series addresses problems with echo reference devices reported in: "[BUG][ADL-N] Kernel panic when echo reference stream is opened" https://github.com/thesofproject/linux/issues/4083 Pierre-Louis Bossart (4): ASoC: Intel: sof_rt5682: always set dpcm_capture for amplifiers ASoC: Intel: sof_cs42l42: always set dpcm_capture for amplifiers ASoC: Intel: sof_nau8825: always set dpcm_capture for amplifiers ASoC: Intel: sof_ssp_amp: always set dpcm_capture for amplifiers sound/soc/intel/boards/sof_cs42l42.c | 3 +++ sound/soc/intel/boards/sof_nau8825.c | 5 +++-- sound/soc/intel/boards/sof_rt5682.c | 5 +++-- sound/soc/intel/boards/sof_ssp_amp.c | 5 ++--- 4 files changed, 11 insertions(+), 7 deletions(-) base-commit: 8dc08c82afbf00e3cbe8944f7e33fa133c01858f -- 2.39.0

2 1

[PATCH v4 0/7] Add SC7280 audioreach device tree nodes
by Srinivasa Rao Mandadapu 20 Jan '23

20 Jan '23

Add SC7280 audioreach device tree nodes and extract audio specific dtsi nodes and add them in new file. This patch series depends on: -- https://patchwork.kernel.org/project/linux-clk/list/?series=713587 Corresponding dt-bindings not mainlined yet. -- https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git/commit… Changes Since v3: -- Remove deleting digital codecs in crd-rev3 board specific dtsi and upadate them using phandle. -- Update commit message in "Update lpass_tlmm node" patch. -- Change the position of status property in LPASS PIL node. -- Update commit message in "Add sound node" patch. Changes Since v2: -- Remove Patch related to Add CGCR reset property. -- Remove Patch related to Disable legacy path clock nodes. -- Add dt-bindings for missing properties. -- Change the order of nodes. -- Move digictal codec macro nodes to root node from soc node. -- Add adsp-pil-mode property in required clock nodes. Changes Since v1: -- Move remoteproc node to soc dtsi file. -- Add qcom, adsp-pil-mode reg property in lpasscc node. -- Fix typo errors. -- Remove redundant status properties. Srinivasa Rao Mandadapu (7): arm64: dts: qcom: sc7280: Extract audio nodes from common idp dtsi file arm64: dts: qcom: sc7280: Add sound node for crd-rev3 board arm64: dts: qcom: sc7280: Add LPASS PIL node arm64: dts: qcom: sc7280: Update VA/RX/TX macro clock nodes arm64: dts: qcom: sc7280: Update lpass_tlmm node arm64: dts: qcom: sc7280: Update qcom,adsp-pil-mode property dt-bindings: remoteproc: qcom: sc7280-adsp-pil: Add missing properties .../bindings/remoteproc/qcom,sc7280-adsp-pil.yaml | 30 +++- arch/arm64/boot/dts/qcom/sc7280-audio-idp.dtsi | 135 ++++++++++++++++ arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 24 +-- .../qcom/sc7280-herobrine-audioreach-wcd9385.dtsi | 171 +++++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 126 --------------- arch/arm64/boot/dts/qcom/sc7280.dtsi | 96 ++++++++++++ 6 files changed, 429 insertions(+), 153 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7280-audio-idp.dtsi create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audioreach-wcd9385.dtsi -- 2.7.4

1 7

[PATCH v3 0/3] drm: Add component_match_add_of and convert users of drm_of_component_match_add
by Sean Anderson 20 Jan '23

20 Jan '23

This series adds a new function component_match_add_of to simplify the common case of calling component_match_add_release with component_release_of and component_compare_of. There is already drm_of_component_match_add, which allows for a custom compare function. However, all existing users just use component_compare_of (or an equivalent). Changes in v3: - Rebase onto drm/drm-next Changes in v2: - Split off conversion from helper addition - Rebase onto drm/drm-next Sean Anderson (3): component: Add helper for device nodes iommu/sound: Use component_match_add_of helper drm: Convert users of drm_of_component_match_add to component_match_add_of .../gpu/drm/arm/display/komeda/komeda_drv.c | 6 ++-- drivers/gpu/drm/arm/hdlcd_drv.c | 9 +----- drivers/gpu/drm/arm/malidp_drv.c | 11 +------ drivers/gpu/drm/armada/armada_drv.c | 10 ++++--- drivers/gpu/drm/drm_of.c | 29 +++---------------- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +-- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 3 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +-- drivers/gpu/drm/msm/msm_drv.c | 14 ++++----- drivers/gpu/drm/sti/sti_drv.c | 3 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 10 ++----- drivers/iommu/mtk_iommu_v1.c | 3 +- include/drm/drm_of.h | 12 -------- include/linux/component.h | 9 ++++++ sound/soc/codecs/wcd938x.c | 6 ++-- 17 files changed, 45 insertions(+), 94 deletions(-) -- 2.35.1.1320.gc452695387.dirty

1 0