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

[PATCH] dt-bindings: sound: ts3a227e: add control of debounce times
by Astrid Rost 13 Sep '22

13 Sep '22

Add devicetree parameters to control the insertion, release and press debounce times. Signed-off-by: Astrid Rost <astrid.rost(a)axis.com> --- Documentation/devicetree/bindings/sound/ts3a227e.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/ts3a227e.txt b/Documentation/devicetree/bindings/sound/ts3a227e.txt index 21ab45bc7e8f..a4aa4154c54c 100644 --- a/Documentation/devicetree/bindings/sound/ts3a227e.txt +++ b/Documentation/devicetree/bindings/sound/ts3a227e.txt @@ -17,6 +17,15 @@ Optional properies: Select 0/1/2/3/4/5/6/7 to specify MICBIAS voltage 2.1V/2.2V/2.3V/2.4V/2.5V/2.6V/2.7V/2.8V Default value is "1" (2.2V). + - ti,debounce-release: key release debounce (datasheet section 9.6.7). + Select 0/1 to specify the release debounce time 0ms/20ms + Default value is "1" (20 ms). + - ti,debounce-press: key press debounce (datasheet section 9.6.7). + Select 0/1/2/3 to specify the press debounce time 2ms/40ms/80ms/120ms + Default value is "2" (80 ms). + - ti,debounce-insertion: headset insertion debounce (datasheet section 9.6.5). + Select 0/1/2/3/4/5/6/7 to specify the insertion debounce time 2ms/30ms/60ms/90ms/120ms/150ms/1s/2s + Default value is "3" (90 ms). Examples: -- 2.20.1

4 10

[PATCH v3 00/14] ASoC/qcom/arm64: Qualcomm ADSP DTS and binding fixes
by Krzysztof Kozlowski 13 Sep '22

13 Sep '22

Hi, Dependencies/merging ==================== 1. The DTS patches are independent. 2. The binding patches should come together, because of context changes. Could be one of: Qualcomm SoC, ASoC or DT tree. Changes since v2 ================ 1. Patch 9: rename and extend commit msg. 2. Add Rb tags. Changes since v1 ================ 1. Patch 9: New patch. 2. Patch 10: Correct also sound/qcom,q6apm-dai.yaml (Rob). 2. Patch 13: New patch. 3. Add Rb/Tb tags. Best regards, Krzysztof Krzysztof Kozlowski (14): arm64: dts: qcom: sdm630: align APR services node names with dtschema arm64: dts: qcom: sdm845: align APR services node names with dtschema arm64: dts: qcom: sm8250: align APR services node names with dtschema arm64: dts: qcom: msm8996: fix APR services nodes arm64: dts: qcom: sdm845: align dai node names with dtschema arm64: dts: qcom: msm8996: align dai node names with dtschema arm64: dts: qcom: qrb5165-rb5: align dai node names with dtschema arm64: dts: qcom: sm8250: use generic name for LPASS clock controller ASoC: dt-bindings:: qcom,q6asm: convert to dtschema dt-bindings: soc: qcom: apr: correct service children ASoC: dt-bindings: qcom,q6dsp-lpass-ports: cleanup example ASoC: dt-bindings: qcom,q6dsp-lpass-clocks: cleanup example ASoC: dt-bindings: qcom,q6apm-dai: adjust indentation in example dt-bindings: soc: qcom: apr: add missing properties .../bindings/soc/qcom/qcom,apr.yaml | 111 +++++++++++++++-- .../bindings/sound/qcom,q6apm-dai.yaml | 21 ++-- .../bindings/sound/qcom,q6asm-dais.yaml | 112 ++++++++++++++++++ .../devicetree/bindings/sound/qcom,q6asm.txt | 70 ----------- .../sound/qcom,q6dsp-lpass-clocks.yaml | 36 +++--- .../sound/qcom,q6dsp-lpass-ports.yaml | 64 +++++----- arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 +- arch/arm64/boot/dts/qcom/sdm630.dtsi | 8 +- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +- .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 4 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 10 +- 14 files changed, 293 insertions(+), 169 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt -- 2.34.1

3 17

RE: Re: [PATCH 1/5] ASoC: dt-bindings: fsl_rpmsg: Add a property to assign platform driver name
by Chancel Liu 13 Sep '22

13 Sep '22

> > Add a string property to assign ASoC platform driver name. It also > > represents the rpmsg channel this sound card sits on. This property > > can be omitted if there is only one sound card and it sits on > > "rpmsg-audio-channel". > > > > Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> > > --- > > .../devicetree/bindings/sound/fsl,rpmsg.yaml | 34 +++++++++++++++++-- > > 1 file changed, 32 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml > b/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml > > index d370c98a62c7..35e3cb9f768b 100644 > > --- a/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml > > +++ b/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml > > @@ -11,8 +11,11 @@ maintainers: > > > > description: | > > fsl_rpmsg is a virtual audio device. Mapping to real hardware devices > > - are SAI, DMA controlled by Cortex M core. What we see from Linux > > - side is a device which provides audio service by rpmsg channel. > > + are SAI, MICFIL, DMA controlled by Cortex M core. What we see from > > + Linux side is a device which provides audio service by rpmsg channel. > > + We can create different sound cards which access different hardwares > > + such as SAI, MICFIL, .etc through building rpmsg channels between > > + Cortex-A and Cortex-M. > > > > properties: > > compatible: > > @@ -85,6 +88,14 @@ properties: > > This is a boolean property. If present, the receiving function > > will be enabled. > > > > + fsl,platform: > > + $ref: /schemas/types.yaml#/definitions/string > > + description: | > > + A string property to assign ASoC platform driver name. > > No, this is not a property of hardware. Naming of some drivers in some > systems does not fit DTS and bindings. > This property aims to tell the ASoC driver which rpmsg channel the sound card depends on. If there are several sound cards sit on rpmsg, we should pass correct information in dts node to specify the name of rpmsg channel. That is why I meant to add this property. I just want to use a string property to distinguish different names of rpmsg channel. Actually this property is hardware-related. As we discussed before, this kind of sound card based on rpmsg works under this mechanism Cortex-A core tells the Cortex-M core configuration of the PCM parameters then Cortex-M controls real hardware devices. This property specifying rpmsg channel represents the real hardware audio controller. That's my idea adding this property. Do you have any better suggestion? > > It also > > + represents the rpmsg channel this sound card sits on. This property > > + can be omitted if there is only one sound card and it sits on > > + "rpmsg-audio-channel". > > + > > required: > > - compatible > > - model > > @@ -107,3 +118,22 @@ examples: > > <&clk IMX8MN_AUDIO_PLL2_OUT>; > > clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k"; > > }; > > + > > + - | > > + #include <dt-bindings/clock/imx8mm-clock.h> > > + > > + rpmsg_micfil: rpmsg_micfil { > > Node names should be generic. > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdevicetre > e-specification.readthedocs.io%2Fen%2Flatest%2Fchapter2-devicetree-basics.h > tml%23generic-names-recommendation&data=05%7C01%7Cchancel.liu% > 40nxp.com%7C8d5f4ca9669349c597b908da8a6a0311%7C686ea1d3bc2b4c6fa > 92cd99c5c301635%7C0%7C0%7C637974485190445475%7CUnknown%7CTWFp > bGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6 > Mn0%3D%7C3000%7C%7C%7C&sdata=SgDveDWfYyVYhBrG9gpi2aPgGV4j > PwtqbQOtbaE%2FI2s%3D&reserved=0 > > Also: no underscores in node names. > > Best regards, > Krzysztof Thanks for your reminder. We will rename the node in patches for next version like: rpmsg_micfil: audio-controller { // property; }; Regards, Chancel Liu

2 1

[PATCH] ALSA: hda/hdmi: change type for the 'assigned' variable
by Jaroslav Kysela 13 Sep '22

13 Sep '22

This change converts the assigned value from int type to the bool type to retain consistency with other structure members like 'setup', 'non_pcm' etc. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/pci/hda/patch_hdmi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 22766810635b..4576af4cff90 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -53,7 +53,7 @@ MODULE_PARM_DESC(enable_all_pins, "Forcibly enable all pins"); struct hdmi_spec_per_cvt { hda_nid_t cvt_nid; - int assigned; + bool assigned; /* the stream has been assigned */ unsigned int channels_min; unsigned int channels_max; u32 rates; @@ -1193,7 +1193,7 @@ static int hdmi_pcm_open_no_pin(struct hda_pcm_stream *hinfo, return err; per_cvt = get_cvt(spec, cvt_idx); - per_cvt->assigned = 1; + per_cvt->assigned = true; hinfo->nid = per_cvt->cvt_nid; pin_cvt_fixup(codec, NULL, per_cvt->cvt_nid); @@ -1262,7 +1262,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, per_cvt = get_cvt(spec, cvt_idx); /* Claim converter */ - per_cvt->assigned = 1; + per_cvt->assigned = true; set_bit(pcm_idx, &spec->pcm_in_use); per_pin = get_pin(spec, pin_idx); @@ -1297,7 +1297,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, snd_hdmi_eld_update_pcm_info(&eld->info, hinfo); if (hinfo->channels_min > hinfo->channels_max || !hinfo->rates || !hinfo->formats) { - per_cvt->assigned = 0; + per_cvt->assigned = false; hinfo->nid = 0; snd_hda_spdif_ctls_unassign(codec, pcm_idx); err = -ENODEV; @@ -1756,7 +1756,7 @@ static void silent_stream_enable(struct hda_codec *codec, } per_cvt = get_cvt(spec, cvt_idx); - per_cvt->assigned = 1; + per_cvt->assigned = true; per_pin->cvt_nid = per_cvt->cvt_nid; per_pin->silent_stream = true; @@ -1816,7 +1816,7 @@ static void silent_stream_disable(struct hda_codec *codec, cvt_idx = cvt_nid_to_cvt_index(codec, per_pin->cvt_nid); if (cvt_idx >= 0 && cvt_idx < spec->num_cvts) { per_cvt = get_cvt(spec, cvt_idx); - per_cvt->assigned = 0; + per_cvt->assigned = false; } if (spec->silent_stream_type == SILENT_STREAM_I915) { @@ -2212,7 +2212,7 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo, goto unlock; } per_cvt = get_cvt(spec, cvt_idx); - per_cvt->assigned = 0; + per_cvt->assigned = false; hinfo->nid = 0; azx_stream(get_azx_dev(substream))->stripe = 0; -- 2.35.3

2 1

[v2] ALSA: hda: Fix Nvidia dp infoframe
by Mohan Kumar 13 Sep '22

13 Sep '22

Nvidia HDA HW expects infoframe data bytes order same for both HDMI and DP i.e infoframe data starts from 5th bytes offset. As dp infoframe structure has 4th byte as valid infoframe data, use hdmi infoframe structure for nvidia dp infoframe to match HW behvaior. Signed-off-by: Mohan Kumar <mkumard(a)nvidia.com> --- sound/pci/hda/patch_hdmi.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 6c209cd26c0c..9127dd1b1a9c 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -170,6 +170,8 @@ struct hdmi_spec { bool dyn_pcm_no_legacy; /* hdmi interrupt trigger control flag for Nvidia codec */ bool hdmi_intr_trig_ctrl; + bool nv_dp_workaround; /* workaround DP audio infoframe for Nvidia */ + bool intel_hsw_fixup; /* apply Intel platform-specific fixups */ /* * Non-generic VIA/NVIDIA specific @@ -679,15 +681,24 @@ static void hdmi_pin_setup_infoframe(struct hda_codec *codec, int ca, int active_channels, int conn_type) { + struct hdmi_spec *spec = codec->spec; union audio_infoframe ai; memset(&ai, 0, sizeof(ai)); - if (conn_type == 0) { /* HDMI */ + if ((conn_type == 0) || /* HDMI */ + /* Nvidia DisplayPort: Nvidia HW expects same layout as HDMI */ + (conn_type == 1 && spec->nv_dp_workaround)) { struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi; - hdmi_ai->type = 0x84; - hdmi_ai->ver = 0x01; - hdmi_ai->len = 0x0a; + if (conn_type == 0) { /* HDMI */ + hdmi_ai->type = 0x84; + hdmi_ai->ver = 0x01; + hdmi_ai->len = 0x0a; + } else {/* Nvidia DP */ + hdmi_ai->type = 0x84; + hdmi_ai->ver = 0x1b; + hdmi_ai->len = 0x11 << 2; + } hdmi_ai->CC02_CT47 = active_channels - 1; hdmi_ai->CA = ca; hdmi_checksum_audio_infoframe(hdmi_ai); @@ -3617,6 +3628,7 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec) spec->pcm_playback.rates = SUPPORTED_RATES; spec->pcm_playback.maxbps = SUPPORTED_MAXBPS; spec->pcm_playback.formats = SUPPORTED_FORMATS; + spec->nv_dp_workaround = true; return 0; } @@ -3756,6 +3768,7 @@ static int patch_nvhdmi(struct hda_codec *codec) spec->chmap.ops.chmap_cea_alloc_validate_get_type = nvhdmi_chmap_cea_alloc_validate_get_type; spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate; + spec->nv_dp_workaround = true; codec->link_down_at_suspend = 1; @@ -3779,6 +3792,7 @@ static int patch_nvhdmi_legacy(struct hda_codec *codec) spec->chmap.ops.chmap_cea_alloc_validate_get_type = nvhdmi_chmap_cea_alloc_validate_get_type; spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate; + spec->nv_dp_workaround = true; codec->link_down_at_suspend = 1; @@ -3992,6 +4006,7 @@ static int tegra_hdmi_init(struct hda_codec *codec) spec->chmap.ops.chmap_cea_alloc_validate_get_type = nvhdmi_chmap_cea_alloc_validate_get_type; spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate; + spec->nv_dp_workaround = true; return 0; } -- 2.17.1

3 3

[PATCH] ALSA: hda: Fix tegra hda dp infoframe struct
by Mohan Kumar 13 Sep '22

13 Sep '22

Tegra HDA HW expects infoframe data bytes order same for both HDMI and DP i.e infoframe data starts from 5th bytes offset. This hw behavior mandates to have dummy bytes for dp infoframe structure for Tegra. Signed-off-by: Mohan Kumar <mkumard(a)nvidia.com> --- sound/pci/hda/patch_hdmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 6c209cd26c0c..a52e764db2e0 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -218,6 +218,9 @@ struct dp_audio_infoframe { u8 type; /* 0x84 */ u8 len; /* 0x1b */ u8 ver; /* 0x11 << 2 */ +#if IS_ENABLED(CONFIG_SND_HDA_TEGRA) + u8 checksum; /* Tegra HW expects infoframe bytes from 5th offset */ +#endif u8 CC02_CT47; /* match with HDMI infoframe from this on */ u8 SS01_SF24; -- 2.17.1

3 2

[PATCH] ALSA: hda/realtek: Add quirk for Huawei WRT-WX9
by huangwenhui 13 Sep '22

13 Sep '22

Fixes headphone and headset microphone detection on Huawei WRT-WX9. Signed-off-by: huangwenhui <huangwenhuia(a)uniontech.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 38930cf5aace..0996a8fd008c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9569,6 +9569,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), SND_PCI_QUIRK(0x1849, 0x1233, "ASRock NUC Box 1100", ALC233_FIXUP_NO_AUDIO_JACK), SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS), + SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20), SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI), SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101), -- 2.20.1

2 1

[PATCH] ALSA: hda/tegra: set depop delay for tegra
by Mohan Kumar 13 Sep '22

13 Sep '22

Reduce the suspend time by setting depop delay to 10ms for tegra. Signed-off-by: Mohan Kumar <mkumard(a)nvidia.com> --- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 6c209cd26c0c..acaf6b790ee1 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -3984,6 +3984,7 @@ static int tegra_hdmi_init(struct hda_codec *codec) generic_hdmi_init_per_pins(codec); + codec->depop_delay = 10; codec->patch_ops.build_pcms = tegra_hdmi_build_pcms; spec->chmap.ops.chmap_cea_alloc_validate_get_type = nvhdmi_chmap_cea_alloc_validate_get_type; -- 2.17.1

2 1

[PATCH] ALSA: hda: add Intel 5 Series / 3400 PCI DID
by Kai Vehmanen 13 Sep '22

13 Sep '22

Handle 0x3b57 variant with same AZX_DCAPS_INTEL_PCH_NOPM capabilities as 0x3b56. In practise this allow use of HDMI/DP display audio via i915. BugLink: https://gitlab.freedesktop.org/drm/intel/-/issues/2751 Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 7e605ce43f41..2a93bc64c2d8 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2543,6 +2543,8 @@ static const struct pci_device_id azx_ids[] = { /* 5 Series/3400 */ { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, + { PCI_DEVICE(0x8086, 0x3b57), + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, /* Poulsbo */ { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE }, base-commit: 0186f7325909dec0cb52814384062f6de3b87941 -- 2.37.3

2 1

Re: [PATCH] ASoC: ak4458.c: move ak4458_reset() under CONFIG_PM
by S.J. Wang 13 Sep '22

13 Sep '22

> Hi Mark > > > > This patch fixup this warning > > > > > > linux/sound/soc/codecs/ak4458.c:631:13: error: 'ak4458_reset' defined > but\ > > > not used [-Werror=unused-function] > > > 631 | static void ak4458_reset(struct ak4458_priv *ak4458, bool active) > > > | ^~~~~~~~~~~~ > > > cc1: all warnings being treated as errors > > > > > > Fixes: e9e7df88996d64 ("ASoC: ak4458: Remove component probe() and > > > remove()") > > > > Is this the best fix, or should we be adding _reset() calls into the > > device level probe() and remove() functions? > > Hmm... I'm not familiar with ak4458.c. > Is your opinion for original patch ? or this patch ? > This patch is just trying to fix the compile issue. > > Thank you for your help !! > Thanks for catching this issue. Without or with _reset() in probe() and remove(), the driver can work in both case. Best regards Wang shengjiu

2 1