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

[PATCH] ALSA: hda/hdmi: Preserve the previous PCM device upon re-enablement
by Takashi Iwai 04 Apr '23

04 Apr '23

When a DRM driver turns on or off the screen with the audio capability, it notifies the ELD to HD-audio HDMI codec driver via component ops. HDMI codec driver, in turn, attaches or detaches the PCM stream for the given port on the fly. The problem is that, since the recent code change, the HDMI driver always treats the PCM stream assignment dynamically; this ended up the confusion of the PCM device appearance. e.g. when a screen goes once off and on again, it may appear on a different PCM device before the screen-off. Although the application should treat such a change, it doesn't seem working gracefully with the current pipewire (maybe PulseAudio, too). As a workaround, this patch changes the HDMI codec driver behavior slightly to be more consistent. Now it remembers the previous PCM slot for the given port and try to assign to it. That is, if a port is re-enabled, the driver tries to use the same PCM slot that was assigned to that port previously. If it conflicts, a new slot is searched and used like before, instead. Fixes: ef6f5494faf6 ("ALSA: hda/hdmi: Use only dynamic PCM device allocation") Link: https://bugzilla.kernel.org/show_bug.cgi?id=217259 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 9ea633fe9339..90352dbc8052 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -81,6 +81,7 @@ struct hdmi_spec_per_pin { struct delayed_work work; struct hdmi_pcm *pcm; /* pointer to spec->pcm_rec[n] dynamically*/ int pcm_idx; /* which pcm is attached. -1 means no pcm is attached */ + int prev_pcm_idx; /* previously assigned pcm index */ int repoll_count; bool setup; /* the stream has been set up by prepare callback */ bool silent_stream; @@ -1380,9 +1381,17 @@ static void hdmi_attach_hda_pcm(struct hdmi_spec *spec, /* pcm already be attached to the pin */ if (per_pin->pcm) return; + /* try the previously used slot at first */ + idx = per_pin->prev_pcm_idx; + if (idx >= 0) { + if (!test_bit(idx, &spec->pcm_bitmap)) + goto found; + per_pin->prev_pcm_idx = -1; /* no longer valid, clear it */ + } idx = hdmi_find_pcm_slot(spec, per_pin); if (idx == -EBUSY) return; + found: per_pin->pcm_idx = idx; per_pin->pcm = get_hdmi_pcm(spec, idx); set_bit(idx, &spec->pcm_bitmap); @@ -1399,6 +1408,7 @@ static void hdmi_detach_hda_pcm(struct hdmi_spec *spec, idx = per_pin->pcm_idx; per_pin->pcm_idx = -1; per_pin->pcm = NULL; + per_pin->prev_pcm_idx = idx; if (idx >= 0 && idx < spec->pcm_used) clear_bit(idx, &spec->pcm_bitmap); } @@ -1924,6 +1934,7 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->pcm = NULL; per_pin->pcm_idx = -1; + per_pin->prev_pcm_idx = -1; per_pin->pin_nid = pin_nid; per_pin->pin_nid_idx = spec->num_nids; per_pin->dev_id = i; -- 2.35.3

3 7

[PATCH v2] kselftest/alsa: Increase kselftest timeout
by Nícolas F. R. A. Prado 03 Apr '23

03 Apr '23

The default timeout for kselftests is 45 seconds, but that isn't enough time to run pcm-test when there are many PCMs on the device, nor for mixer-test when slower control buses and fancier CODECs are present. As data points, running pcm-test on mt8192-asurada-spherion takes about 1m15s, and mixer-test on rk3399-gru-kevin takes about 2m. Set the timeout to 4 minutes to allow both pcm-test and mixer-test to run to completion with some slack. Reviewed-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Nícolas F. R. A. Prado <nfraprado(a)collabora.com> --- Changes in v2: - Reduced timeout from 10 to 4 minutes - Tweaked commit message to also mention mixer-test and run time for mixer-test on rk3399-gru-kevin tools/testing/selftests/alsa/settings | 1 + 1 file changed, 1 insertion(+) create mode 100644 tools/testing/selftests/alsa/settings diff --git a/tools/testing/selftests/alsa/settings b/tools/testing/selftests/alsa/settings new file mode 100644 index 000000000000..b478e684846a --- /dev/null +++ b/tools/testing/selftests/alsa/settings @@ -0,0 +1 @@ +timeout=240 -- 2.39.0

3 3

[PATCH] ASoC: mediatek: mt8186: Move some prints to debug level
by Allen-KH Cheng 03 Apr '23

03 Apr '23

There are many log messages scattered throughout the mt8186 sound drivers, and they are frequently triggered. To avoid spamming the console, move these messages to the debug level. Signed-off-by: Allen-KH Cheng <allen-kh.cheng(a)mediatek.com> --- sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 26 +++++++++---------- sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 4 +-- .../mt8186/mt8186-mt6366-da7219-max98357.c | 2 +- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 6 ++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c b/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c index eda913fa147a..20b9f5d810ec 100644 --- a/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c +++ b/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c @@ -85,7 +85,7 @@ int mt8186_afe_gpio_init(struct device *dev) aud_gpios[i].name); if (IS_ERR(aud_gpios[i].gpioctrl)) { ret = PTR_ERR(aud_gpios[i].gpioctrl); - dev_info(dev, "%s(), pinctrl_lookup_state %s fail, ret %d\n", + dev_dbg(dev, "%s(), pinctrl_lookup_state %s fail, ret %d\n", __func__, aud_gpios[i].name, ret); } else { aud_gpios[i].gpio_prepare = true; @@ -108,13 +108,13 @@ static int mt8186_afe_gpio_select(struct device *dev, int ret = 0; if (type < 0 || type >= MT8186_AFE_GPIO_GPIO_NUM) { - dev_err(dev, "%s(), error, invalid gpio type %d\n", + dev_dbg(dev, "%s(), error, invalid gpio type %d\n", __func__, type); return -EINVAL; } if (!aud_gpios[type].gpio_prepare) { - dev_err(dev, "%s(), error, gpio type %d not prepared\n", + dev_dbg(dev, "%s(), error, gpio type %d not prepared\n", __func__, type); return -EIO; } @@ -122,7 +122,7 @@ static int mt8186_afe_gpio_select(struct device *dev, ret = pinctrl_select_state(aud_pinctrl, aud_gpios[type].gpioctrl); if (ret) { - dev_err(dev, "%s(), error, can not set gpio type %d\n", + dev_dbg(dev, "%s(), error, can not set gpio type %d\n", __func__, type); return ret; } @@ -137,25 +137,25 @@ static int mt8186_afe_gpio_adda_dl(struct device *dev, bool enable) if (enable) { ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_CLK_MOSI_ON); if (ret) { - dev_err(dev, "%s(), MOSI CLK ON select fail!\n", __func__); + dev_dbg(dev, "%s(), MOSI CLK ON select fail!\n", __func__); return ret; } ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_DAT_MOSI_ON); if (ret) { - dev_err(dev, "%s(), MOSI DAT ON select fail!\n", __func__); + dev_dbg(dev, "%s(), MOSI DAT ON select fail!\n", __func__); return ret; } } else { ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_DAT_MOSI_OFF); if (ret) { - dev_err(dev, "%s(), MOSI DAT OFF select fail!\n", __func__); + dev_dbg(dev, "%s(), MOSI DAT OFF select fail!\n", __func__); return ret; } ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_CLK_MOSI_OFF); if (ret) { - dev_err(dev, "%s(), MOSI CLK ON select fail!\n", __func__); + dev_dbg(dev, "%s(), MOSI CLK ON select fail!\n", __func__); return ret; } } @@ -170,25 +170,25 @@ static int mt8186_afe_gpio_adda_ul(struct device *dev, bool enable) if (enable) { ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_CLK_MISO_ON); if (ret) { - dev_err(dev, "%s(), MISO CLK ON select fail!\n", __func__); + dev_dbg(dev, "%s(), MISO CLK ON select fail!\n", __func__); return ret; } ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_DAT_MISO_ON); if (ret) { - dev_err(dev, "%s(), MISO DAT ON select fail!\n", __func__); + dev_dbg(dev, "%s(), MISO DAT ON select fail!\n", __func__); return ret; } } else { ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_DAT_MISO_OFF); if (ret) { - dev_err(dev, "%s(), MISO DAT OFF select fail!\n", __func__); + dev_dbg(dev, "%s(), MISO DAT OFF select fail!\n", __func__); return ret; } ret = mt8186_afe_gpio_select(dev, MT8186_AFE_GPIO_CLK_MISO_OFF); if (ret) { - dev_err(dev, "%s(), MISO CLK OFF select fail!\n", __func__); + dev_dbg(dev, "%s(), MISO CLK OFF select fail!\n", __func__); return ret; } } @@ -230,7 +230,7 @@ int mt8186_afe_gpio_request(struct device *dev, bool enable, sel = enable ? MT8186_AFE_GPIO_PCM_ON : MT8186_AFE_GPIO_PCM_OFF; break; default: - dev_err(dev, "%s(), invalid dai %d\n", __func__, dai); + dev_dbg(dev, "%s(), invalid dai %d\n", __func__, dai); goto unlock; } diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c index 094402470dc2..247ab8df941f 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c @@ -110,7 +110,7 @@ static unsigned int adda_dl_rate_transform(struct mtk_base_afe *afe, case 192000: return MTK_AFE_ADDA_DL_RATE_192K; default: - dev_info(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", + dev_dbg(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", __func__, rate); } @@ -134,7 +134,7 @@ static unsigned int adda_ul_rate_transform(struct mtk_base_afe *afe, case 192000: return MTK_AFE_ADDA_UL_RATE_192K; default: - dev_info(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", + dev_dbg(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", __func__, rate); } diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c index 970b980a81e6..cdf54d1eb50d 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c @@ -1061,7 +1061,7 @@ static int mt8186_mt6366_da7219_max98357_dev_probe(struct platform_device *pdev) card->name = card->topology_shortname; sof_on = 1; } else { - dev_info(&pdev->dev, "Probe without adsp\n"); + dev_dbg(&pdev->dev, "Probe without adsp\n"); } if (of_property_read_bool(pdev->dev.of_node, "mediatek,dai-link")) { diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index b333950aa3c3..7538274641fd 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -95,7 +95,7 @@ static int dmic_set(struct snd_kcontrol *kcontrol, priv->dmic_switch = ucontrol->value.integer.value[0]; if (priv->dmic_sel) { gpiod_set_value(priv->dmic_sel, priv->dmic_switch); - dev_info(dapm->card->dev, "dmic_set_value %d\n", + dev_dbg(dapm->card->dev, "dmic_set_value %d\n", priv->dmic_switch); } return 0; @@ -139,7 +139,7 @@ static int primary_codec_init(struct snd_soc_pcm_runtime *rtd) } if (!priv->dmic_sel) { - dev_info(card->dev, "dmic_sel is null\n"); + dev_dbg(card->dev, "dmic_sel is null\n"); return 0; } @@ -1152,7 +1152,7 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) card->name = card->topology_shortname; sof_on = 1; } else { - dev_info(&pdev->dev, "Probe without adsp\n"); + dev_dbg(&pdev->dev, "Probe without adsp\n"); } if (of_property_read_bool(pdev->dev.of_node, "mediatek,dai-link")) { -- 2.18.0

2 1

[PATCH v2] firmware: cs_dsp: Add a debugfs entry containing control details
by Richard Fitzgerald 03 Apr '23

03 Apr '23

From: Simon Trimmer <simont(a)opensource.cirrus.com> The file named 'controls' in the DSP's debugfs root contains a formatted table describing the controls defined within the loaded DSP firmware, it is of the form name: len region:offset addr fwname algid ctltype flags en dirty Where flags is represented as a character for each flag if set, or '-', enabled is whether the control is enabled or disabled and dirty is whether the control value is set in the cache but not the hardware. Signed-off-by: Simon Trimmer <simont(a)opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- drivers/firmware/cirrus/cs_dsp.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c index 513136a924cf..e4ccfb6a8fa5 100644 --- a/drivers/firmware/cirrus/cs_dsp.c +++ b/drivers/firmware/cirrus/cs_dsp.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/vmalloc.h> @@ -457,6 +458,33 @@ static const struct { }, }; +static int cs_dsp_coeff_base_reg(struct cs_dsp_coeff_ctl *ctl, unsigned int *reg, + unsigned int off); + +static int cs_dsp_debugfs_read_controls_show(struct seq_file *s, void *ignored) +{ + struct cs_dsp *dsp = s->private; + struct cs_dsp_coeff_ctl *ctl; + unsigned int reg; + + list_for_each_entry(ctl, &dsp->ctl_list, list) { + cs_dsp_coeff_base_reg(ctl, &reg, 0); + seq_printf(s, "%22.*s: %#8zx %s:%08x %#8x %s %#8x %#4x %c%c%c%c %s %s\n", + ctl->subname_len, ctl->subname, ctl->len, + cs_dsp_mem_region_name(ctl->alg_region.type), + ctl->offset, reg, ctl->fw_name, ctl->alg_region.alg, ctl->type, + ctl->flags & WMFW_CTL_FLAG_VOLATILE ? 'V' : '-', + ctl->flags & WMFW_CTL_FLAG_SYS ? 'S' : '-', + ctl->flags & WMFW_CTL_FLAG_READABLE ? 'R' : '-', + ctl->flags & WMFW_CTL_FLAG_WRITEABLE ? 'W' : '-', + ctl->enabled ? "enabled" : "disabled", + ctl->set ? "dirty" : "clean"); + } + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(cs_dsp_debugfs_read_controls); + /** * cs_dsp_init_debugfs() - Create and populate DSP representation in debugfs * @dsp: pointer to DSP structure @@ -479,6 +507,9 @@ void cs_dsp_init_debugfs(struct cs_dsp *dsp, struct dentry *debugfs_root) debugfs_create_file(cs_dsp_debugfs_fops[i].name, 0444, root, dsp, &cs_dsp_debugfs_fops[i].fops); + debugfs_create_file("controls", 0444, root, dsp, + &cs_dsp_debugfs_read_controls_fops); + dsp->debugfs_root = root; } EXPORT_SYMBOL_NS_GPL(cs_dsp_init_debugfs, FW_CS_DSP); -- 2.30.2

2 1

[PATCH v1 0/3] Add TDM audio on StarFive JH7110
by Walker Chen 03 Apr '23

03 Apr '23

This patchset adds TDM audio driver for the StarFive JH7110 SoC. The first patch adds device tree binding for TDM module. The second patch adds tdm driver support for JH7110 SoC. The last patch adds device node of tdm and sound card to JH7110 dts. The series has been tested on the VisionFive 2 boards which equip with JH7110 SoC and works normally. The last patch should be applied after the following patchset: https://lore.kernel.org/all/20230322094820.24738-1-walker.chen@starfivetech… Walker Chen (3): dt-bindings: sound: Add TDM for StarFive JH7110 ASoC: starfive: Add JH7110 TDM driver riscv: dts: starfive: add tdm node and sound card .../bindings/sound/starfive,jh7110-tdm.yaml | 95 +++ MAINTAINERS | 6 + .../jh7110-starfive-visionfive-2.dtsi | 87 +++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 34 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/starfive/Kconfig | 15 + sound/soc/starfive/Makefile | 2 + sound/soc/starfive/jh7110_tdm.c | 579 ++++++++++++++++++ sound/soc/starfive/jh7110_tdm.h | 155 +++++ 10 files changed, 975 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml create mode 100644 sound/soc/starfive/Kconfig create mode 100644 sound/soc/starfive/Makefile create mode 100644 sound/soc/starfive/jh7110_tdm.c create mode 100644 sound/soc/starfive/jh7110_tdm.h base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6 prerequisite-patch-id: c3a6b87df79b338fc97766406d010fedb79ab428 prerequisite-patch-id: b49509523cf7c098f684647bdc4fdaece48b61bc prerequisite-patch-id: 46cc850aa0e9e03ccf5ed23d8458babfca3d71af prerequisite-patch-id: a6975e61ee5803fbd74b1c21ab925fd81c3c0eab prerequisite-patch-id: ac150a8c622e858e088df8121093d448df49c245 prerequisite-patch-id: 044263ef2fb9f1e5a586edbf85d5f67814a28430 prerequisite-patch-id: 89f049f951e5acf75aab92541992f816fd0acc0d prerequisite-patch-id: 9f3dbc9073eee89134e68977e941e457593c2757 prerequisite-patch-id: 8600b156a235be2b3db53be3f834e7a370e2cfb9 prerequisite-patch-id: 1b2d0982b18da060c82134f05bf3ce16425bac8d prerequisite-patch-id: 090ba4b78d47bc19204916e76fdbc70021785388 prerequisite-patch-id: a5d9e0f7d4f8163f566678894cf693015119f2d9 prerequisite-patch-id: 4c12d958e3a3d629d86dddb1e4f099d8909393e0 prerequisite-patch-id: bb939c0c7c26b08addfccd890f9d3974b6eaec53 prerequisite-patch-id: 8f5c66dfb14403424044192f6fa05b347ad356a7 prerequisite-patch-id: fd93763b95469912bde9bdfa4cd827c8d5dba9c6 prerequisite-patch-id: 6987950c2eb4b3773b2df8f7934eff434244aeab prerequisite-patch-id: 258ea5f9b8bf41b6981345dcc81795f25865d38f prerequisite-patch-id: 8b6f2c9660c0ac0ee4e73e4c21aca8e6b75e81b9 prerequisite-patch-id: dbb0c0151b8bdf093e6ce79fd2fe3f60791a6e0b prerequisite-patch-id: e7773c977a7b37692e9792b21cc4f17fa58f9215 prerequisite-patch-id: d57e95d31686772abc4c4d5aa1cadc344dc293cd prerequisite-patch-id: 9f911969d0a550648493952c99096d26e05d4d83 prerequisite-patch-id: 2ddada18ab6ea5cd1da14212aaf59632f5203d40 prerequisite-patch-id: 398744c61913c76a35754de867c4f820ca7a8d99 prerequisite-patch-id: be3d7a6a13098884ec26cd5e543cc95c39045e35 prerequisite-patch-id: b3ce7955a80d90d992b7d1bca3409f465810b2bb prerequisite-patch-id: db2f66860cc5b2fd2f71747c4428287b6e3153fb prerequisite-patch-id: 9da71dcd3af4c68da9d855b43aab6927103e7525 prerequisite-patch-id: 2d9e4f185631549094b6136cf8717a507b68c5bb prerequisite-patch-id: bb8e071ed43998874b9d98292c0dcdeedc0760ca prerequisite-patch-id: cd0b464336aabfbfad96c1a3595c0f9ce9401638 prerequisite-patch-id: 24eab3d30274700c2be4727bece743c76d2618bd prerequisite-patch-id: 584c256c9acb52ee2773d0c81c3f4977fc18155a prerequisite-patch-id: 2bc43b375b470f7e8bbe937b78678ba3856e3b8f prerequisite-patch-id: 32deea16304859842af5c2151bc41d91cf6dfc9b prerequisite-patch-id: d85dbedbb3b36bbd6806f4eb84a2129c8f8963aa prerequisite-patch-id: c0bdbdd3db98f7ebae0661dd331edac2c84c70f8 prerequisite-patch-id: 6abf359fa445f4104432ddee27044dfbfb128417 -- 2.17.1

4 10

[PATCH v3 00/10] ASoC: add audio digital codecs for Qualcomm SM8550
by Krzysztof Kozlowski 03 Apr '23

03 Apr '23

Hi, This patchset can be merged as is - no dependencies. Changes since v2 ================ 1. Rebase. 2. New patch: ASoC: dt-bindings: qcom,lpass-va-macro: Add missing NPL clock. 3. Add Rb tags. Changes since v1 ================ 1. Move the flag define to common header. NOT a dependency ================ The patchset can be applied independently of my previous fix: https://lore.kernel.org/linux-arm-msm/20230310100937.32485-1-krzysztof.kozl… Logically, better if they were together, but code will work fine other way. Best regards, Krzysztof Krzysztof Kozlowski (10): ASoC: dt-bindings: qcom,lpass-rx-macro: narrow clocks per variants ASoC: dt-bindings: qcom,lpass-rx-macro: Add SM8550 RX macro ASoC: codecs: lpass-rx-macro: add support for SM8550 ASoC: dt-bindings: qcom,lpass-tx-macro: narrow clocks per variants ASoC: dt-bindings: qcom,lpass-tx-macro: Add SM8550 TX macro ASoC: codecs: lpass-tx-macro: add support for SM8550 ASoC: dt-bindings: qcom,lpass-va-macro: Add missing NPL clock ASoC: dt-bindings: qcom,lpass-va-macro: Add SM8550 VA macro ASoC: dt-bindings: qcom,lpass-wsa-macro: Add SM8550 WSA macro ASoC: codecs: lpass-wsa-macro: add support for SM8550 .../bindings/sound/qcom,lpass-rx-macro.yaml | 76 +++++++++++++--- .../bindings/sound/qcom,lpass-tx-macro.yaml | 81 +++++++++++++---- .../bindings/sound/qcom,lpass-va-macro.yaml | 86 ++++++++++++++++--- .../bindings/sound/qcom,lpass-wsa-macro.yaml | 23 ++++- sound/soc/codecs/lpass-macro-common.h | 3 + sound/soc/codecs/lpass-rx-macro.c | 36 ++++++-- sound/soc/codecs/lpass-tx-macro.c | 35 ++++++-- sound/soc/codecs/lpass-wsa-macro.c | 37 ++++++-- 8 files changed, 309 insertions(+), 68 deletions(-) -- 2.34.1

2 14

[PATCH] ASoC: fsl_sai: Use physical format width
by Emil Abildgaard Svendsen 03 Apr '23

03 Apr '23

Slot width should follow the physical width of the format instead of the data width. This is needed for formats like SNDRV_PCM_FMTBIT_S24_LE where physical width is 32 and data width is 24. By using the physical width, data won't get misaligned. Signed-off-by: Emil Svendsen <emas(a)bang-olufsen.dk> --- sound/soc/fsl/fsl_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 939c6bdd22c4..213e2d462076 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -519,13 +519,13 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, unsigned int channels = params_channels(params); struct snd_dmaengine_dai_dma_data *dma_params; struct fsl_sai_dl_cfg *dl_cfg = sai->dl_cfg; + u32 slot_width = params_physical_width(params); u32 word_width = params_width(params); int trce_mask = 0, dl_cfg_idx = 0; int dl_cfg_cnt = sai->dl_cfg_cnt; u32 dl_type = FSL_SAI_DL_I2S; u32 val_cr4 = 0, val_cr5 = 0; u32 slots = (channels == 1) ? 2 : channels; - u32 slot_width = word_width; int adir = tx ? RX : TX; u32 pins, bclk; u32 watermark; -- 2.34.1

3 4

[PATCH] dt-bindings: maxim,max98371: Convert to DT schema
by André Morishita 01 Apr '23

01 Apr '23

Convert the Maxim Integrated MAX98371 audio codec bindings to DT schema. Signed-off-by: André Morishita <andremorishita(a)gmail.com> --- .../devicetree/bindings/sound/max98371.txt | 17 -------- .../bindings/sound/maxim,max98371.yaml | 41 +++++++++++++++++++ 2 files changed, 41 insertions(+), 17 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/max98371.txt create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98371.yaml diff --git a/Documentation/devicetree/bindings/sound/max98371.txt b/Documentation/devicetree/bindings/sound/max98371.txt deleted file mode 100644 index 8b2b2704b574..000000000000 --- a/Documentation/devicetree/bindings/sound/max98371.txt +++ /dev/null @@ -1,17 +0,0 @@ -max98371 codec - -This device supports I2C mode only. - -Required properties: - -- compatible : "maxim,max98371" -- reg : The chip select number on the I2C bus - -Example: - -&i2c { - max98371: max98371@31 { - compatible = "maxim,max98371"; - reg = <0x31>; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/maxim,max98371.yaml b/Documentation/devicetree/bindings/sound/maxim,max98371.yaml new file mode 100644 index 000000000000..df0262473399 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/maxim,max98371.yaml @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/maxim,max98371.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim MAX98371 audio codec + +maintainers: + - anish kumar <yesanishhere(a)gmail.com> + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + const: maxim,max98371 + + '#sound-dai-cells': + const: 0 + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + max98371: max98371@31 { + compatible = "maxim,max98371"; + reg = <0x31>; + }; + }; -- 2.40.0

2 4

[PATCH] ALSA: hda/realtek: Add quirk for Clevo X370SNW
by Tim Crawford 31 Mar '23

31 Mar '23

From: Jeremy Soller <jeremy(a)system76.com> Fixes speaker output and headset detection on Clevo X370SNW. Signed-off-by: Jeremy Soller <jeremy(a)system76.com> Signed-off-by: Tim Crawford <tcrawford(a)system76.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 b501f9489fc1..028d8bd1e2c8 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2624,6 +2624,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3), SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX), + SND_PCI_QUIRK(0x1558, 0x3702, "Clevo X370SN[VW]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x65d2, "Clevo PB51R[CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), -- 2.39.2

2 1

[GIT PULL] ASoC fixes for v6.3-rc4
by Mark Brown 31 Mar '23

31 Mar '23

The following changes since commit eeac8ede17557680855031c6f305ece2378af326: Linux 6.3-rc2 (2023-03-12 16:36:44 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.3-rc4 for you to fetch changes up to e3720f92e0237921da537e47a0b24e27899203f8: ASoC: SOF: avoid a NULL dereference with unsupported widgets (2023-03-29 14:40:18 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.3 More fixes for v6.3, plus a few new trivial device ID additions. Almost all of this is for the Intel drivers, though there is one core fix from Shengjiu which ensures that format constraints are correctly applied in some cases where they were missed. ---------------------------------------------------------------- Duy Nguyen (1): ASoC: da7213.c: add missing pm_runtime_disable() Eugene Huang (2): ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15 ASoC: Intel: soc-acpi: add table for Intel 'Rooks County' NUC M15 Ge-org Brohammer (1): ASoC: amd: yc: Add DMI entries to support Victus by HP Laptop 16-e1xxx (8A22) Guennadi Liakhovetski (1): ASoC: SOF: avoid a NULL dereference with unsupported widgets Hans de Goede (1): ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750 Jason Montleon (1): ASoC: hdac_hdmi: use set_stream() instead of set_tdm_slots() Mark Brown (2): Merge tag 'v6.3-rc2' into asoc-6.3 to fix clock related failures ASOC: Intel: add quirk for Intel 'Rooks County' NUC Ranjani Sridharan (1): ASoC: SOF: ipc4: Ensure DSP is in D0I0 during sof_ipc4_set_get_data() Shengjiu Wang (1): ASoC: soc-pcm: fix hw->formats cleared by soc_pcm_hw_init() for dpcm Srinivas Kandagatla (1): ASoC: codecs: lpass: fix the order or clks turn off during suspend sound/soc/amd/yc/acp6x-mach.c | 7 +++++ sound/soc/codecs/da7213.c | 6 ++++ sound/soc/codecs/da7219-aad.c | 2 ++ sound/soc/codecs/hdac_hdmi.c | 17 ++++++++---- sound/soc/codecs/hdmi-codec.c | 11 ++++++++ sound/soc/codecs/lpass-rx-macro.c | 4 +-- sound/soc/codecs/lpass-tx-macro.c | 15 +++++----- sound/soc/codecs/lpass-wsa-macro.c | 4 +-- sound/soc/fsl/Kconfig | 4 +++ sound/soc/intel/avs/boards/da7219.c | 21 ++++++++++++++ sound/soc/intel/avs/boards/max98357a.c | 22 +++++++++++++++ sound/soc/intel/avs/boards/nau8825.c | 14 +++++----- sound/soc/intel/avs/boards/rt5682.c | 22 +++++++++++++++ sound/soc/intel/avs/boards/ssm4567.c | 31 --------------------- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++ sound/soc/intel/boards/sof_sdw.c | 11 ++++++++ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 22 ++++++++++++++- sound/soc/qcom/qdsp6/q6prm.c | 4 +-- sound/soc/soc-pcm.c | 4 +++ sound/soc/sof/intel/hda-ctrl.c | 3 ++ sound/soc/sof/intel/hda-dsp.c | 12 ++++++++ sound/soc/sof/intel/pci-apl.c | 1 + sound/soc/sof/intel/pci-cnl.c | 2 ++ sound/soc/sof/intel/pci-icl.c | 1 + sound/soc/sof/intel/pci-mtl.c | 1 + sound/soc/sof/intel/pci-skl.c | 2 ++ sound/soc/sof/intel/pci-tgl.c | 7 +++++ sound/soc/sof/intel/pci-tng.c | 6 +--- sound/soc/sof/ipc3-topology.c | 32 +++++++++++++++++++-- sound/soc/sof/ipc3.c | 5 ++-- sound/soc/sof/ipc4-control.c | 3 +- sound/soc/sof/ipc4-topology.c | 29 +++++++++++++++---- sound/soc/sof/ipc4-topology.h | 8 ++++-- sound/soc/sof/ipc4.c | 8 ++++++ sound/soc/sof/sof-audio.c | 32 +++++++++++++++++---- sound/soc/sof/topology.c | 34 +++++++++++------------ 36 files changed, 321 insertions(+), 98 deletions(-)

2 1