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

[PATCH] ASoC: dt-bindings: amlogic,gx-sound-card: drop minItems for audio-widgets
by Neil Armstrong 26 Jun '24

26 Jun '24

Like "audio-routing" drop the minItems: 2 from the "audio-widgets", because any limit here - lower or upper- is rather meaningless. This will also fix `dtbs_check` warnings like: sound: audio-widgets: ['Speaker', '7J4-14 LEFT', 'Speaker', '7J4-11 RIGHT'] is too long Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml index d4277d342e69..0ecdaf7190e9 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml @@ -23,7 +23,6 @@ properties: audio-widgets: $ref: /schemas/types.yaml#/definitions/non-unique-string-array - minItems: 2 description: |- A list off component DAPM widget. Each entry is a pair of strings, the first being the widget type, the second being the widget name --- base-commit: c3f38fa61af77b49866b006939479069cd451173 change-id: 20240605-topic-amlogic-upstream-bindings-fixes-audio-widgets-00e1afcda10b Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

3 4

[PATCH 1/2] ASoC: codecs: lpass-macro: Gracefully handle unknown version
by Krzysztof Kozlowski 26 Jun '24

26 Jun '24

Qualcomm LPASS macro codec driver parses registers in order to detect version of the codec. It recognizes codecs v2.0 - v2.8, however we know that there are earlier versions and 'enum lpass_codec_version' has also v1.0, v1.1 and v1.2. If by any chance we run on unrecognized version, driver will use random value from the stack as the codec version. Fix it by mapping such cases to an enum of value 0: LPASS_CODEC_VERSION_UNKNOWN. Fixes: 378918d59181 ("ASoC: codecs: lpass-macro: add helpers to get codec version") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/lpass-macro-common.h | 3 ++- sound/soc/codecs/lpass-va-macro.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h index f6f1bfe8eb77..94697d0ba8c9 100644 --- a/sound/soc/codecs/lpass-macro-common.h +++ b/sound/soc/codecs/lpass-macro-common.h @@ -19,7 +19,8 @@ enum lpass_version { }; enum lpass_codec_version { - LPASS_CODEC_VERSION_1_0 = 1, + LPASS_CODEC_VERSION_UNKNOWN, + LPASS_CODEC_VERSION_1_0, LPASS_CODEC_VERSION_1_1, LPASS_CODEC_VERSION_1_2, LPASS_CODEC_VERSION_2_0, diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index ae80865cd459..f9262d7d2c26 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -1463,7 +1463,8 @@ static int va_macro_validate_dmic_sample_rate(u32 dmic_sample_rate, static void va_macro_set_lpass_codec_version(struct va_macro *va) { - int core_id_0 = 0, core_id_1 = 0, core_id_2 = 0, version; + int core_id_0 = 0, core_id_1 = 0, core_id_2 = 0; + int version = LPASS_CODEC_VERSION_UNKNOWN; regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_0, &core_id_0); regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_1, &core_id_1); -- 2.43.0

3 4

[PATCH] ASoC: rt5645: fix issue of random interrupt from push-button
by Jack Yu 26 Jun '24

26 Jun '24

Modify register setting sequence of enabling inline command to fix issue of random interrupt from push-button. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- sound/soc/codecs/rt5645.c | 24 ++++++++++++++++++------ sound/soc/codecs/rt5645.h | 6 ++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index cdb7ff7020e9..51187b1e0ed2 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -81,7 +81,7 @@ static const struct reg_sequence init_list[] = { static const struct reg_sequence rt5650_init_list[] = { {0xf6, 0x0100}, {RT5645_PWR_ANLG1, 0x02}, - {RT5645_IL_CMD3, 0x0018}, + {RT5645_IL_CMD3, 0x6728}, }; static const struct reg_default rt5645_reg[] = { @@ -3130,20 +3130,32 @@ static void rt5645_enable_push_button_irq(struct snd_soc_component *component, bool enable) { struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); + int ret; if (enable) { snd_soc_dapm_force_enable_pin(dapm, "ADC L power"); snd_soc_dapm_force_enable_pin(dapm, "ADC R power"); snd_soc_dapm_sync(dapm); + snd_soc_component_update_bits(component, RT5650_4BTN_IL_CMD2, + RT5645_EN_4BTN_IL_MASK | RT5645_RST_4BTN_IL_MASK, + RT5645_EN_4BTN_IL_EN | RT5645_RST_4BTN_IL_RST); + usleep_range(10000, 15000); + snd_soc_component_update_bits(component, RT5650_4BTN_IL_CMD2, + RT5645_EN_4BTN_IL_MASK | RT5645_RST_4BTN_IL_MASK, + RT5645_EN_4BTN_IL_EN | RT5645_RST_4BTN_IL_NORM); + msleep(50); + ret = snd_soc_component_read(component, RT5645_INT_IRQ_ST); + pr_debug("%s read %x = %x\n", __func__, RT5645_INT_IRQ_ST, + snd_soc_component_read(component, RT5645_INT_IRQ_ST)); + snd_soc_component_write(component, RT5645_INT_IRQ_ST, ret); + ret = snd_soc_component_read(component, RT5650_4BTN_IL_CMD1); + pr_debug("%s read %x = %x\n", __func__, RT5650_4BTN_IL_CMD1, + snd_soc_component_read(component, RT5650_4BTN_IL_CMD1)); + snd_soc_component_write(component, RT5650_4BTN_IL_CMD1, ret); snd_soc_component_update_bits(component, RT5650_4BTN_IL_CMD1, 0x3, 0x3); snd_soc_component_update_bits(component, RT5645_INT_IRQ_ST, 0x8, 0x8); - snd_soc_component_update_bits(component, - RT5650_4BTN_IL_CMD2, 0x8000, 0x8000); - snd_soc_component_read(component, RT5650_4BTN_IL_CMD1); - pr_debug("%s read %x = %x\n", __func__, RT5650_4BTN_IL_CMD1, - snd_soc_component_read(component, RT5650_4BTN_IL_CMD1)); } else { snd_soc_component_update_bits(component, RT5650_4BTN_IL_CMD2, 0x8000, 0x0); snd_soc_component_update_bits(component, RT5645_INT_IRQ_ST, 0x8, 0x0); diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index 90816b2c5489..bef74b29fd54 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -2011,6 +2011,12 @@ #define RT5645_ZCD_HP_DIS (0x0 << 15) #define RT5645_ZCD_HP_EN (0x1 << 15) +/* Buttons Inline Command Function 2 (0xe0) */ +#define RT5645_EN_4BTN_IL_MASK (0x1 << 15) +#define RT5645_EN_4BTN_IL_EN (0x1 << 15) +#define RT5645_RST_4BTN_IL_MASK (0x1 << 14) +#define RT5645_RST_4BTN_IL_RST (0x0 << 14) +#define RT5645_RST_4BTN_IL_NORM (0x1 << 14) /* Codec Private Register definition */ /* DAC ADC Digital Volume (0x00) */ -- 2.34.1

2 1

[PATCH 0/3] ASoC: codecs: lpass-wsa-macro: Add support for newer v2.5 version
by Krzysztof Kozlowski 26 Jun '24

26 Jun '24

Hi, LPASS codec v2.5 and newer have differences in registers which we did not implement so far. Lack of proper support is visible during playback: on SoCs with v2.6 (e.g. Qualcomm SM8550) only one speaker plays. Add missing bits for v2.5 and newer codecs. This is similar work to already merged: https://lore.kernel.org/all/20240612-lpass-codec-v25-v4-0-f63d3676dbc4@lina… No dependencies. Best regards, Krzysztof --- Krzysztof Kozlowski (3): ASoC: codecs: lpass-wsa-macro: Drop unused define ASoC: codecs: lpass-wsa-macro: Prepare to accommodate new codec versions ASoC: codecs: lpass-wsa-macro: Correct support for newer v2.5 version sound/soc/codecs/lpass-wsa-macro.c | 644 ++++++++++++++++++++++++++++++------- 1 file changed, 521 insertions(+), 123 deletions(-) --- base-commit: d585065ee5b64c60496a2403bafee1540cb319ec change-id: 20240625-qcom-audio-wsa-second-speaker-ee1a5d2d267b Best regards, -- Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>

3 5

[PATCH v1 2/4] ASoC: codecs: ES8326: codec can't enter suspend issue
by Zhang Yi 26 Jun '24

26 Jun '24

> > > Thanks for your advice. But unfortunately codec didn't enter suspend after marking > > > the widgets with snd_soc_dapm_ignore_suspend(). We will modify the trigger conditions > > > for enable_micbias and disable_micbias to solve this issue > > Really? We should fix that - that's the use case for this feature. > > What goes wrong? > > We mark "MICBIAS1" and "MICBIAS2" with snd_soc_dapm_ignore_suspend() at es8326_enable_micbias(), > and make "MICBIAS1" "MICBIAS2" active with snd_soc_dapm_force_enable_pin_unlocked(). > But when the device enter suspend, the codec can't enter suspend. I'm sorry to bother you. I have marked "MICBIAS1" and "MICBIAS2" with snd_soc_dapm_ignore_suspend() at es8326_enable_micbias().I'll show this part of my drive below. But the codec can't enter suspend. And no error messages were found at the kernel log. Do you have any suggestions? static void es8326_enable_micbias(struct snd_soc_component *component) { struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); snd_soc_dapm_mutex_lock(dapm); snd_soc_dapm_ignore_suspend(dapm, "MICBIAS1"); snd_soc_dapm_ignore_suspend(dapm, "MICBIAS2"); snd_soc_dapm_force_enable_pin_unlocked(dapm, "MICBIAS1"); snd_soc_dapm_force_enable_pin_unlocked(dapm, "MICBIAS2");

1 0

[PATCH] ASoC: codecs: lpass-rx-macro: add missing handling of v2.1 codec
by Krzysztof Kozlowski 25 Jun '24

25 Jun '24

We have also v2.1 version of the codec (see 'enum lpass_codec_version'), so handle it as well in all switch cases. Fixes: dbacef05898d ("ASoC: codec: lpass-rx-macro: prepare driver to accomdate new codec versions") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/lpass-rx-macro.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 00ecc470ba8b..1c3429f004ed 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -1601,6 +1601,7 @@ static bool rx_is_rw_register(struct device *dev, unsigned int reg) case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_2_0: + case LPASS_CODEC_VERSION_2_1: return rx_pre_2_5_is_rw_register(dev, reg); case LPASS_CODEC_VERSION_2_5: case LPASS_CODEC_VERSION_2_6: @@ -3639,6 +3640,7 @@ static int rx_macro_component_probe(struct snd_soc_component *component) case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_2_0: + case LPASS_CODEC_VERSION_2_1: controls = rx_macro_def_snd_controls; num_controls = ARRAY_SIZE(rx_macro_def_snd_controls); widgets = rx_macro_def_dapm_widgets; @@ -3812,6 +3814,7 @@ static int rx_macro_probe(struct platform_device *pdev) case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_2_0: + case LPASS_CODEC_VERSION_2_1: rx->rxn_reg_stride = 0x80; def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_pre_2_5_defaults); reg_defaults = kmalloc_array(def_count, sizeof(struct reg_default), GFP_KERNEL); -- 2.43.0

4 3

Virtual nodes created by UCM rules have the exact same nick, making them indistinguishable in KDE's audio applet
by GitHub issues - opened 25 Jun '24

25 Jun '24

alsa-project/alsa-ucm-conf issue #426 was opened from z411: Hello, Recently KDE Plasma's applet started using the node's nick to show the name of the device. The problem is that for audio interfaces that separate their inputs into virtual interfaces, they end up with something like this: ``` alsa.card_name = "Volt 2" device.profile.description = "Mono Input 1" node.description = "Volt 2 Mono Input 1" node.nick = "Volt 2" ``` ``` alsa.card_name = "Volt 2" device.profile.description = "Mono Input 2" node.description = "Volt 2 Mono Input 2" node.nick = "Volt 2" ``` Since they use the same nick, the end result is that we end up with an input list that looks like this: ![image](https://github.com/alsa-project/alsa-ucm-conf/assets/1988512/34e794ce-07ce-45b8-8be4-073dad24d339) Could the node nick be changed to reflect that this is a virtual device that refers to a different input from the same device? We already have an issue about this open in PipeWire and KDE issue trackers but we're not sure where this should be really fixed. Thanks. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/426 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2] ALSA: hda/realtek: Enable headset mic on IdeaPad 330-17IKB 81DM
by Ajrat Makhmutov 25 Jun '24

25 Jun '24

Headset microphone do not work out of the box with this laptop. This quirk fixes it. Zihao Wang specified the wrong subsystem id in his patch. Link: https://lore.kernel.org/all/20220424084120.74125-1-wzhd@ustc.edu/ Fixes: 3b79954fd00d ("ALSA: hda/realtek: Add quirk for Yoga Duet 7 13ITL6 speakers") Signed-off-by: Ajrat Makhmutov <rauty(a)altlinux.org> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index aa76d1c88589..5ec95a7903b8 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10502,7 +10502,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS), SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940 / Yoga Duet 7", ALC298_FIXUP_LENOVO_C940_DUET7), SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS), - SND_PCI_QUIRK(0x17aa, 0x3820, "Yoga Duet 7 13ITL6", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3820, "IdeaPad 330-17IKB 81DM", ALC269_FIXUP_ASPIRE_HEADSET_MIC), SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS), SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF), SND_PCI_QUIRK(0x17aa, 0x3834, "Lenovo IdeaPad Slim 9i 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), -- 2.33.8

4 13

[PATCH 0/4] ASoC: Intel: boards: updates for 6.11 - part2
by Pierre-Louis Bossart 25 Jun '24

25 Jun '24

Minor additions and cleanups this time. Bard Liao (1): ASoC: Intel: sof_sdw: select PINCTRL_CS42L43 and SPI_CS42L43 Brent Lu (1): ASoC: Intel: maxim-common: add max_98373_get_tx_mask function Pierre-Louis Bossart (2): ASoC: Intel: sof_sdw: fix jack detection on ADL-N variant RVP ASoC: Intel: sof_sdw: add quirk for Dell SKU 0B8C sound/soc/intel/boards/Kconfig | 2 + sound/soc/intel/boards/sof_maxim_common.c | 56 +++++++++++++++++------ sound/soc/intel/boards/sof_sdw.c | 18 ++++++++ 3 files changed, 63 insertions(+), 13 deletions(-) -- 2.43.0

2 8

[PATCH v1 2/4] ASoC: codecs: ES8326: codec can't enter suspend issue
by Zhang Yi 25 Jun '24

25 Jun '24

> > > Should mark the widgets with snd_soc_dapm_ignore_suspend() to allow the device to suspend with the widgets enabled. > > Thanks for your advice. But unfortunately codec didn't enter suspend after marking > > the widgets with snd_soc_dapm_ignore_suspend(). We will modify the trigger conditions > > for enable_micbias and disable_micbias to solve this issue > Really? We should fix that - that's the use case for this feature. > What goes wrong? We mark "MICBIAS1" and "MICBIAS2" with snd_soc_dapm_ignore_suspend() at es8326_enable_micbias(), and make "MICBIAS1" "MICBIAS2" active with snd_soc_dapm_force_enable_pin_unlocked(). But when the device enter suspend, the codec can't enter suspend.

1 0