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

[RFC PATCH 0/7] sun4i-i2s: Support channel remapping
by John Watts 31 Aug '23

31 Aug '23

Hi there, A while back I put out this thread: How do I set up multiple codecs on one I2S - without TDM?" https://lore.kernel.org/all/ZMBRMnv0GQF4wyfQ@titan/ This is my specific use case and motivation for this patch series. I posted how I managed to configure the audio-graph-card2 to allow doing this in conjunction with some register hacking, but I now have an initial patch series to support this in the sun4i-i2s driver. Now I've tested this on the T113-s3 with 3 wm8782s and it works well, but I'm marking this as RFC as I think I'm out of my depth here and I'd like to know the direction I need to take this: I'm new to kernel development and I'm genuinely unsure what are best practices and which are bad practices design-wise. My main concerns are the following: First, I split up channel-dins and channel-slots. This is mainly because I implemented one first but both of them only make sense together. The registers themselves use a format of a byte per channel with the upper nibble being the din and the lower being the slot. Perhaps this is a better format to copy? Second, I use u8 arrays on the device tree. This is done so I can just read the array easily, but it also means I can't make this property contingent on a compatible string in the schema as $ref doesn't seem to be allowed there. Third, channel-slots is available on all sun4i-i2s controllers, but I only have it implemented on the R329 variant for now when there are multiple din pins. I could add support for this on older controllers but there's not really a use case for manual configuration as there's no DIN and I don't have hardware to test it on. Fourth, I don't limit the readable channels to the channels listed. Reading more channels than you have currently results in the controller assuming you want to use TDM, but that's not the case here and you can have strange duplicate channels show up. Fifth, it might be a good idea to increase the maximum channels from 8 to 16, especially if people are going to be running multiple TDM streams on one controller. Sixth, the channel-slots only apply to capture, not playback. This is something I just realized now when writing and forgot to document in the patch set. Thanks for your time, John. John Watts (7): ASoC: sunxi: sun4i-i2s: Prepare for runtime DIN pin selection ASoC: sunxi: sun4i-i2s: Use channel-dins device tree property ASoC: sunxi: sun4i-i2s: Prepare for runtime channel slot selection ASoC: sunxi: sun4i-i2s: Use channel-slots device tree property ASoC: sunxi: sun4i-i2s: Detect TDM slots based on channel slots dt-bindings: sound: sun4i-i2s: Add channel-dins property dt-bindings: sound: sun4i-i2s: Add channel-slots property .../sound/allwinner,sun4i-a10-i2s.yaml | 30 +++++ sound/soc/sunxi/sun4i-i2s.c | 106 +++++++++++++++++- 2 files changed, 132 insertions(+), 4 deletions(-) -- 2.41.0

3 10

linux-6.5/sound/soc/codecs/rt722-sdca.c:612: some confused logic ?
by David Binderman 31 Aug '23

31 Aug '23

Hello there, I just ran cppcheck over the source code of linux-6.5. It said: linux-6.5/sound/soc/codecs/rt722-sdca.c:612:8: style: Expression is always true because 'else if' condition is opposite to previous condition at line 609. [multiCondition] Source code is if (!adc_vol_flag) /* boost gain */ ctl = regvalue / boost_step; else { /* ADC gain */ if (adc_vol_flag) ctl = p->max - (((vol_max - regvalue) & 0xffff) / interval_offset); else ctl = p->max - (((0 - regvalue) & 0xffff) / interval_offset); } This code might benefit from some rework. Regards David Binderman

1 0

[PATCH V2 1/3] ASoC: dt-bindings: fsl_easrc: Add support for imx8mp-easrc
by Adam Ford 31 Aug '23

31 Aug '23

The i.MX8MP appears to have the same easrc support as the Nano, so add imx8mp as an option with a fallback to imx8mn. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Fixed errors: ['fsl,imx8mn-easrc'] is too short 'fsl,imx8mn-easrc' is not one of ['fsl,imx8mp-easrc'] diff --git a/Documentation/devicetree/bindings/sound/fsl,easrc.yaml b/Documentation/devicetree/bindings/sound/fsl,easrc.yaml index bdde68a1059c..a680d7aff237 100644 --- a/Documentation/devicetree/bindings/sound/fsl,easrc.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,easrc.yaml @@ -14,7 +14,13 @@ properties: pattern: "^easrc@.*" compatible: - const: fsl,imx8mn-easrc + oneOf: + - enum: + - fsl,imx8mn-easrc + - items: + - enum: + - fsl,imx8mp-easrc + - const: fsl,imx8mn-easrc reg: maxItems: 1 -- 2.39.2

4 6

[PATCH 1/7] ASoC: cs35l45: Add support for Chip ID 0x35A460
by Vlad Karpovich 30 Aug '23

30 Aug '23

The 0x35A460 chip is a different variant of the cs35l45. Signed-off-by: Vlad Karpovich <vkarpovi(a)opensource.cirrus.com> --- sound/soc/codecs/cs35l45.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/cs35l45.c b/sound/soc/codecs/cs35l45.c index 8f480df7f29a..7f116ae97acd 100644 --- a/sound/soc/codecs/cs35l45.c +++ b/sound/soc/codecs/cs35l45.c @@ -1078,6 +1078,7 @@ static int cs35l45_initialize(struct cs35l45_private *cs35l45) switch (dev_id[0]) { case 0x35A450: + case 0x35A460: break; default: dev_err(cs35l45->dev, "Bad DEVID 0x%x\n", dev_id[0]); -- 2.25.1

3 16

[PATCH] ASoC: cs35l56: Waiting for firmware to boot must be tolerant of I/O errors
by Richard Fitzgerald 29 Aug '23

29 Aug '23

From: Simon Trimmer <simont(a)opensource.cirrus.com> Ignore failure to read from the cs35l56 when polling as the device will NAK i2c accesses until it has booted and this would terminate the poll of regmap_read_poll_timeout(). Fixes: 8a731fd37f8b ("ASoC: cs35l56: Move utility functions to shared file") Signed-off-by: Simon Trimmer <simont(a)opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- sound/soc/codecs/cs35l56-shared.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index ae373f335ea8..98b1e63360ae 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -243,26 +243,27 @@ int cs35l56_wait_for_firmware_boot(struct cs35l56_base *cs35l56_base) { unsigned int reg; unsigned int val; - int ret; + int read_ret, poll_ret; if (cs35l56_base->rev < CS35L56_REVID_B0) reg = CS35L56_DSP1_HALO_STATE_A1; else reg = CS35L56_DSP1_HALO_STATE; - ret = regmap_read_poll_timeout(cs35l56_base->regmap, reg, - val, - (val < 0xFFFF) && (val >= CS35L56_HALO_STATE_BOOT_DONE), - CS35L56_HALO_STATE_POLL_US, - CS35L56_HALO_STATE_TIMEOUT_US); + /* + * This can't be a regmap_read_poll_timeout() because cs35l56 will NAK + * I2C until it has booted which would terminate the poll + */ + poll_ret = read_poll_timeout(regmap_read, read_ret, + (val < 0xFFFF) && (val >= CS35L56_HALO_STATE_BOOT_DONE), + CS35L56_HALO_STATE_POLL_US, + CS35L56_HALO_STATE_TIMEOUT_US, + false, + cs35l56_base->regmap, reg, &val); - if ((ret < 0) && (ret != -ETIMEDOUT)) { - dev_err(cs35l56_base->dev, "Failed to read HALO_STATE: %d\n", ret); - return ret; - } - - if ((ret == -ETIMEDOUT) || (val != CS35L56_HALO_STATE_BOOT_DONE)) { - dev_err(cs35l56_base->dev, "Firmware boot fail: HALO_STATE=%#x\n", val); + if (poll_ret) { + dev_err(cs35l56_base->dev, "Firmware boot timed out(%d): HALO_STATE=%#x\n", + read_ret, val); return -EIO; } -- 2.30.2

2 1

[PATCH v2 1/1] ALSA: control: Use list_for_each_entry_safe()
by Andy Shevchenko 29 Aug '23

29 Aug '23

Instead of reiterating the list, use list_for_each_entry_safe() that allows to continue without starting over. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Reviewed-by: Jaroslav Kysela <perex(a)perex.cz> --- v2: fixed a typo (Jaroslav), added tag (Jaroslav) sound/core/control_led.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/core/control_led.c b/sound/core/control_led.c index a78eb48927c7..43ea995c095a 100644 --- a/sound/core/control_led.c +++ b/sound/core/control_led.c @@ -297,16 +297,13 @@ static void snd_ctl_led_clean(struct snd_card *card) { unsigned int group; struct snd_ctl_led *led; - struct snd_ctl_led_ctl *lctl; + struct snd_ctl_led_ctl *lctl, _lctl; for (group = 0; group < MAX_LED; group++) { led = &snd_ctl_leds[group]; -repeat: - list_for_each_entry(lctl, &led->controls, list) - if (!card || lctl->card == card) { + list_for_each_entry_safe(lctl, _lctl, &led->controls, list) + if (!card || lctl->card == card) snd_ctl_led_ctl_destroy(lctl); - goto repeat; - } } } @@ -314,7 +311,7 @@ static int snd_ctl_led_reset(int card_number, unsigned int group) { struct snd_card *card; struct snd_ctl_led *led; - struct snd_ctl_led_ctl *lctl; + struct snd_ctl_led_ctl *lctl, _lctl; struct snd_kcontrol_volatile *vd; bool change = false; @@ -329,14 +326,12 @@ static int snd_ctl_led_reset(int card_number, unsigned int group) return -ENXIO; } led = &snd_ctl_leds[group]; -repeat: - list_for_each_entry(lctl, &led->controls, list) + list_for_each_entry_safe(lctl, _lctl, &led->controls, list) if (lctl->card == card) { vd = &lctl->kctl->vd[lctl->index_offset]; vd->access &= ~group_to_access(group); snd_ctl_led_ctl_destroy(lctl); change = true; - goto repeat; } mutex_unlock(&snd_ctl_led_mutex); if (change) -- 2.40.0.1.gaa8946217a0b

2 2

[PATCH next] ASoC: cs42l43: Fix missing error code in cs42l43_codec_probe()
by Harshit Mogalapalli 29 Aug '23

29 Aug '23

When clk_get_optional() fails, the error handling code does a 'goto err_pm' with ret = 0, which is resturning success on a failure path. Fix this by assigning the PTR_ERR(priv->mclk) to ret variable. Fixes: fc918cbe874e ("ASoC: cs42l43: Add support for the cs42l43") Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> --- This is based on static analysis with smatch, only compile tested. --- sound/soc/codecs/cs42l43.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c index 24e718e51174..1a95c370fc4c 100644 --- a/sound/soc/codecs/cs42l43.c +++ b/sound/soc/codecs/cs42l43.c @@ -2205,7 +2205,8 @@ static int cs42l43_codec_probe(struct platform_device *pdev) // Don't use devm as we need to get against the MFD device priv->mclk = clk_get_optional(cs42l43->dev, "mclk"); if (IS_ERR(priv->mclk)) { - dev_err_probe(priv->dev, PTR_ERR(priv->mclk), "Failed to get mclk\n"); + ret = PTR_ERR(priv->mclk); + dev_err_probe(priv->dev, ret, "Failed to get mclk\n"); goto err_pm; } -- 2.39.3

3 2

[PATCH] ASoC: codecs: wcd93xx: fix object added to multiple drivers
by Krzysztof Kozlowski 29 Aug '23

29 Aug '23

Three Qualcomm audio codecs (WCD9355, WCD934x and WCD938x) use the same object file wcd-clsh-v2.o leading to warnings: Makefile: wcd-clsh-v2.o is added to multiple modules: snd-soc-wcd9335 snd-soc-wcd934x snd-soc-wcd938x Convert the wcd-clsh-v2.o to a module to solve it. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/Kconfig | 6 ++++++ sound/soc/codecs/Makefile | 8 +++++--- sound/soc/codecs/wcd-clsh-v2.c | 8 ++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 95b5bd883215..f1e1dbc509f6 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1968,11 +1968,15 @@ config SND_SOC_UDA1380 tristate depends on I2C +config SND_SOC_WCD_CLASSH + tristate + config SND_SOC_WCD9335 tristate "WCD9335 Codec" depends on SLIMBUS select REGMAP_SLIMBUS select REGMAP_IRQ + select SND_SOC_WCD_CLASSH help The WCD9335 is a standalone Hi-Fi audio CODEC IC, supports Qualcomm Technologies, Inc. (QTI) multimedia solutions, @@ -1987,6 +1991,7 @@ config SND_SOC_WCD934X depends on SLIMBUS select REGMAP_IRQ select REGMAP_SLIMBUS + select SND_SOC_WCD_CLASSH select SND_SOC_WCD_MBHC depends on MFD_WCD934X || COMPILE_TEST help @@ -1997,6 +2002,7 @@ config SND_SOC_WCD938X depends on SND_SOC_WCD938X_SDW tristate depends on SOUNDWIRE || !SOUNDWIRE + select SND_SOC_WCD_CLASSH config SND_SOC_WCD938X_SDW tristate "WCD9380/WCD9385 Codec - SDW" diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index c8502a49b40a..a87e56938ce5 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -303,10 +303,11 @@ snd-soc-twl4030-objs := twl4030.o snd-soc-twl6040-objs := twl6040.o snd-soc-uda1334-objs := uda1334.o snd-soc-uda1380-objs := uda1380.o +snd-soc-wcd-classh-objs := wcd-clsh-v2.o snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o -snd-soc-wcd9335-objs := wcd-clsh-v2.o wcd9335.o -snd-soc-wcd934x-objs := wcd-clsh-v2.o wcd934x.o -snd-soc-wcd938x-objs := wcd938x.o wcd-clsh-v2.o +snd-soc-wcd9335-objs := wcd9335.o +snd-soc-wcd934x-objs := wcd934x.o +snd-soc-wcd938x-objs := wcd938x.o snd-soc-wcd938x-sdw-objs := wcd938x-sdw.o snd-soc-wl1273-objs := wl1273.o snd-soc-wm-adsp-objs := wm_adsp.o @@ -685,6 +686,7 @@ obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o obj-$(CONFIG_SND_SOC_TWL6040) += snd-soc-twl6040.o obj-$(CONFIG_SND_SOC_UDA1334) += snd-soc-uda1334.o obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o +obj-$(CONFIG_SND_SOC_WCD_CLASSH) += snd-soc-wcd-classh.o obj-$(CONFIG_SND_SOC_WCD_MBHC) += snd-soc-wcd-mbhc.o obj-$(CONFIG_SND_SOC_WCD9335) += snd-soc-wcd9335.o obj-$(CONFIG_SND_SOC_WCD934X) += snd-soc-wcd934x.o diff --git a/sound/soc/codecs/wcd-clsh-v2.c b/sound/soc/codecs/wcd-clsh-v2.c index a75db27e5205..d96e23ec43d4 100644 --- a/sound/soc/codecs/wcd-clsh-v2.c +++ b/sound/soc/codecs/wcd-clsh-v2.c @@ -355,6 +355,7 @@ void wcd_clsh_set_hph_mode(struct wcd_clsh_ctrl *ctrl, int mode) wcd_clsh_v2_set_hph_mode(comp, mode); } +EXPORT_SYMBOL_GPL(wcd_clsh_set_hph_mode); static void wcd_clsh_set_flyback_current(struct snd_soc_component *comp, int mode) @@ -869,11 +870,13 @@ int wcd_clsh_ctrl_set_state(struct wcd_clsh_ctrl *ctrl, return 0; } +EXPORT_SYMBOL_GPL(wcd_clsh_ctrl_set_state); int wcd_clsh_ctrl_get_state(struct wcd_clsh_ctrl *ctrl) { return ctrl->state; } +EXPORT_SYMBOL_GPL(wcd_clsh_ctrl_get_state); struct wcd_clsh_ctrl *wcd_clsh_ctrl_alloc(struct snd_soc_component *comp, int version) @@ -890,8 +893,13 @@ struct wcd_clsh_ctrl *wcd_clsh_ctrl_alloc(struct snd_soc_component *comp, return ctrl; } +EXPORT_SYMBOL_GPL(wcd_clsh_ctrl_alloc); void wcd_clsh_ctrl_free(struct wcd_clsh_ctrl *ctrl) { kfree(ctrl); } +EXPORT_SYMBOL_GPL(wcd_clsh_ctrl_free); + +MODULE_DESCRIPTION("WCD93XX Class-H driver"); +MODULE_LICENSE("GPL"); -- 2.34.1

2 1

Front 3.5mm panel not recognized (MSI X370 Gaming Pro & MSI B450-A Pro)
by GitHub issues - opened 29 Aug '23

29 Aug '23

alsa-project/alsa-ucm-conf issue #344 was opened from fiftydinar: Realtek ALC892 soundcard on both. alsa-info.sh (MSI X370 Gaming Pro) http://alsa-project.org/db/?f=26d6d5ef7701fabf260fd75e0d2bd135976019dd alsa.info.sh (MSI B450-A Pro) http://alsa-project.org/db/?f=621f405abe6c94f4a3069caba7ab7cb802d03563 Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/344 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v1 1/1] ALSA: control: Use list_for_each_entry_safe()
by Andy Shevchenko 29 Aug '23

29 Aug '23

Instead of reiterating the list, use list_for_each_entry_safe() that allows to continue without starting over. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- Takashi, if you have anybody or want yourself to spend some time, I believe you can simplify a lot the parser in this file with the help of lib/cmdline.c APIs. sound/core/control_led.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/core/control_led.c b/sound/core/control_led.c index a78eb48927c7..afc9ffc388e3 100644 --- a/sound/core/control_led.c +++ b/sound/core/control_led.c @@ -297,16 +297,13 @@ static void snd_ctl_led_clean(struct snd_card *card) { unsigned int group; struct snd_ctl_led *led; - struct snd_ctl_led_ctl *lctl; + struct snd_ctl_led_ctl *lctl, _lctl; for (group = 0; group < MAX_LED; group++) { led = &snd_ctl_leds[group]; -repeat: - list_for_each_entry(lctl, &led->controls, list) - if (!card || lctl->card == card) { + list_for_each_entry_safe(lctl, _lctl, &led->controls, list) + if (!card || lctl->card == card) snd_ctl_led_ctl_destroy(lctl); - goto repeat; - } } } @@ -314,7 +311,7 @@ static int snd_ctl_led_reset(int card_number, unsigned int group) { struct snd_card *card; struct snd_ctl_led *led; - struct snd_ctl_led_ctl *lctl; + struct snd_ctl_led_ctl *lctl, _lctl; struct snd_kcontrol_volatile *vd; bool change = false; @@ -329,14 +326,12 @@ static int snd_ctl_led_reset(int card_number, unsigned int group) return -ENXIO; } led = &snd_ctl_leds[group]; -repeat: - list_for_each_entry(lctl, &led->controls, list) + list_for_each_entry(lctl, _lctl, &led->controls, list) if (lctl->card == card) { vd = &lctl->kctl->vd[lctl->index_offset]; vd->access &= ~group_to_access(group); snd_ctl_led_ctl_destroy(lctl); change = true; - goto repeat; } mutex_unlock(&snd_ctl_led_mutex); if (change) -- 2.40.0.1.gaa8946217a0b

4 5