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

[PATCH 0/2] SM6115 TX Macro
by Konrad Dybcio 12 Sep '23

12 Sep '23

Like most Qualcomm SoCs, SM6115 has a TX Macro. Only some minor changes were required. Signed-off-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> --- Konrad Dybcio (2): ASoC: dt-bindings: qcom,lpass-tx-macro: Add SM6115 ASoC: codecs: lpass-tx-macro: Add SM6115 support .../bindings/sound/qcom,lpass-tx-macro.yaml | 18 ++++++++++++++++++ sound/soc/codecs/lpass-macro-common.h | 2 ++ sound/soc/codecs/lpass-tx-macro.c | 22 +++++++++++++++------- 3 files changed, 35 insertions(+), 7 deletions(-) --- base-commit: 6269320850097903b30be8f07a5c61d9f7592393 change-id: 20230825-topic-6115tx-b523a0209639 Best regards, -- Konrad Dybcio <konrad.dybcio(a)linaro.org>

3 7

[PATCH v4 00/11] sound: Use -EPROBE_DEFER instead of i915 module loading.
by Maarten Lankhorst 12 Sep '23

12 Sep '23

Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads. -EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop. The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted. Compared to previous version, I picked up Pierre's changes to add a probe_no_wq, added remove_no_wq myself and then fixed the SOF changes to use it. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Cezary Rojewski <cezary.rojewski(a)intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Cc: Bard Liao <yung-chuan.liao(a)linux.intel.com> Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Daniel Baluta <daniel.baluta(a)nxp.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Maarten Lankhorst (9): ALSA: hda/intel: Fix error handling in azx_probe() ALSA: hda/i915: Allow override of gpu binding. ALSA: hda/i915: Add an allow_modprobe argument to snd_hdac_i915_init ALSA: hda/i915: Allow xe as match for i915_component_master_match ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work. ASoC: SOF: Intel: Move binding to display driver outside of deferred probe ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init Pierre-Louis Bossart (2): ASoC: SOF: core: add 'no_wq' probe and remove callbacks ASoC: SOF: Intel: hda: start splitting the probe sound/hda/hdac_i915.c | 24 ++++++----- sound/pci/hda/hda_intel.c | 60 ++++++++++++++-------------- sound/soc/intel/avs/core.c | 13 ++++-- sound/soc/intel/skylake/skl.c | 31 +++++--------- sound/soc/sof/core.c | 11 ++++- sound/soc/sof/intel/hda-common-ops.c | 2 + sound/soc/sof/intel/hda.c | 31 ++++++++------ sound/soc/sof/intel/hda.h | 2 + sound/soc/sof/ops.h | 16 ++++++++ sound/soc/sof/sof-priv.h | 2 + 10 files changed, 112 insertions(+), 80 deletions(-) -- 2.39.2

6 27

[PATCH v3 1/4] ASoC: cs35l45: Checks index of cs35l45_irqs[]
by Vlad Karpovich 11 Sep '23

11 Sep '23

From: Ricardo Rivera-Matos <rriveram(a)opensource.cirrus.com> Checks the index computed by the virq offset before printing the error condition in cs35l45_spk_safe_err() handler. Signed-off-by: Ricardo Rivera-Matos <rriveram(a)opensource.cirrus.com> Signed-off-by: Vlad Karpovich <vkarpovi(a)opensource.cirrus.com> --- sound/soc/codecs/cs35l45.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs35l45.c b/sound/soc/codecs/cs35l45.c index 2ac4612402eb..02b1172d2647 100644 --- a/sound/soc/codecs/cs35l45.c +++ b/sound/soc/codecs/cs35l45.c @@ -1023,7 +1023,10 @@ static irqreturn_t cs35l45_spk_safe_err(int irq, void *data) i = irq - regmap_irq_get_virq(cs35l45->irq_data, 0); - dev_err(cs35l45->dev, "%s condition detected!\n", cs35l45_irqs[i].name); + if (i < 0 || i >= ARRAY_SIZE(cs35l45_irqs)) + dev_err(cs35l45->dev, "Unspecified global error condition (%d) detected!\n", irq); + else + dev_err(cs35l45->dev, "%s condition detected!\n", cs35l45_irqs[i].name); return IRQ_HANDLED; } -- 2.25.1

4 12

[RESEND,v3 0/3] ASoC: mt8188-mt6359: add SOF support
by Trevor Wu 11 Sep '23

11 Sep '23

This series introduces dynamic pinctrl and adds support for the SOF on the mt8188-mt6359 machine driver. Changes since v2: - revise mtk_sof_check_tplg_be_dai_link_fixup(). Changes since v1: - minor changes to incorporate the suggestions from the reviewer. Trevor Wu (3): ASoC: mediatek: mt8188-mt6359: support dynamic pinctrl ASoC: mediatek: common: revise SOF common code ASoC: mediatek: mt8188-mt6359: add SOF support .../soc/mediatek/common/mtk-dsp-sof-common.c | 113 +++++++-- .../soc/mediatek/common/mtk-dsp-sof-common.h | 8 + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 239 +++++++++++++++++- 3 files changed, 332 insertions(+), 28 deletions(-) -- 2.18.0

3 6

[PATCH v3 0/2] Match data improvements for ak4642 driver
by Biju Das 11 Sep '23

11 Sep '23

This patch series aims to add match data improvements for ak4642 driver. This patch series is only compile tested. v2->v3: * Patch#1 for cleanups and patch#2 for simplifying probe() * Replace local variable np with dev_fwnode() * Replace dev_err()->dev_err_probe(). * Remove comma in the terminator entry for OF table. * Drop a space in the terminator entry for ID table. v1->v2: * Removed forward declaration ak4642_of_match and ak4642_i2c_id. * Restored error EINVAL. * Used dev_fwnode() and replaced dev->of_node. * Removed comma in the terminator entry. Biju Das (2): ASoC: ak4642: Minor cleanups in probe() ASoC: ak4642: Simplify probe() sound/soc/codecs/ak4642.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) -- 2.25.1

2 3

[PATCH v3 0/3] Match data improvements for tlv320aic32x4 driver
by Biju Das 11 Sep '23

11 Sep '23

This patch series aims to add match data improvements for tlv320aic32x4 driver. This patch series is only compile tested. v2->v3: * Added Rb tag from Andy for patch#1 and patch#2 * Simplified aic32x4_spi_probe() in patch#3. v1->v2: * Created patch#1 for adding enum aic32x4_type to aic32x4_probe() and drop using dev_set_drvdata() from tlv320aic32x4_{i2c,spi} drivers. * Return value of i2c_get_match_data() passed to type paramemter in aic32x4_probe(). Biju Das (3): ASoC: codec: tlv320aic32x4: Add enum aic32x4_type to aic32x4_probe() ASoC: tlv320aic32x4-i2c: Simplify probe() ASoC: tlv320aic32x4-spi: Simplify probe() sound/soc/codecs/tlv320aic32x4-i2c.c | 19 +++---------------- sound/soc/codecs/tlv320aic32x4-spi.c | 18 +++--------------- sound/soc/codecs/tlv320aic32x4.c | 5 +++-- sound/soc/codecs/tlv320aic32x4.h | 3 ++- 4 files changed, 11 insertions(+), 34 deletions(-) -- 2.25.1

2 4

[PATCH v2 0/2] Match data improvements for tlv320aic32x4 driver
by Biju Das 11 Sep '23

11 Sep '23

This patch series aims to add match data improvements for tlv320aic32x4 driver. This patch series is only compile tested. v1->v2: * Created patch#1 for adding enum aic32x4_type to aic32x4_probe() and drop using dev_set_drvdata() from tlv320aic32x4_{i2c,spi} drivers. * Return value of i2c_get_match_data() passed to type paramemter in aic32x4_probe(). Biju Das (2): ASoC: codec: tlv320aic32x4: Add enum aic32x4_type to aic32x4_probe() ASoC: tlv320aic32x4-i2c: Simplify probe() sound/soc/codecs/tlv320aic32x4-i2c.c | 19 +++---------------- sound/soc/codecs/tlv320aic32x4-spi.c | 7 ++++--- sound/soc/codecs/tlv320aic32x4.c | 5 +++-- sound/soc/codecs/tlv320aic32x4.h | 3 ++- 4 files changed, 12 insertions(+), 22 deletions(-) -- 2.25.1

3 7

[PATCH v3 0/5] ASoC: amd: acp: Add sound support for a line of HUAWEI laptops
by Marian Postevca 11 Sep '23

11 Sep '23

This series adds support for a line of HUAWEI laptops with AMD CPUs that connect using the ACP3x module to a ES8336 CODEC. The CODEC driver must be extended to support the S32 LE format and the MCLK div by 2 option. MCLK div by 2 is needed for one specific SKU, which uses a 48Mhz MCLK, which seems to be too high of a frequency for the CODEC and must be divided by 2. The acp legacy driver must also be extended by using callbacks so that the more complicated handling of this specific CODEC can be moved outside the more generic ACP code. Changes in v3: - Modified commit message for patch 1: ASoC: es8316: Enable support for S32 LE format. The commit message implied that S32 LE format is the only one that is supported by the machine driver. The AMD ACP supports a wide variety of formats that are also supported by the CODEC. Now the purpose of the patch is to enable one additional format that is supported by the CODEC chip. - Added new patch: Replace NR_SUPPORTED_MCLK_LRCK_RATIOS with ARRAY_SIZE() No need to have a special define when we can use ARRAY_SIZE() directly. - Reworked the MCLK div by 2 option. Now the CODEC driver will first try to use halved frequency by checking if it can generate suitable clocking. If it can not, then the full MCLK will be used. In this way we can also support unknown SKU that have a too high MCLK frequency. - Moved generic ACP code from patch 5, that introduces the new machine driver, to patch 4, that introduces ACP legacy callback mechanism. - Removed the forced S32 LE format in the new machine driver. Marian Postevca (5): ASoC: es8316: Enable support for S32 LE format ASoC: es8316: Replace NR_SUPPORTED_MCLK_LRCK_RATIOS with ARRAY_SIZE() ASoC: es8316: Enable support for MCLK div by 2 ASoC: amd: acp: Add support for splitting the codec specific code from the ACP driver ASoC: amd: acp: Add machine driver that enables sound for systems with a ES8336 codec sound/soc/amd/acp-config.c | 70 +++ sound/soc/amd/acp/Makefile | 2 +- sound/soc/amd/acp/acp-legacy-mach.c | 102 +++- sound/soc/amd/acp/acp-mach-common.c | 8 + sound/soc/amd/acp/acp-mach.h | 67 +++ sound/soc/amd/acp/acp-renoir.c | 4 + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 443 ++++++++++++++++++ sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h | 12 + sound/soc/codecs/es8316.c | 52 +- sound/soc/codecs/es8316.h | 3 + 10 files changed, 736 insertions(+), 27 deletions(-) create mode 100644 sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c create mode 100644 sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h -- 2.41.0

2 6

[PATCH v2] ASoC: ak4642: Simplify probe()
by Biju Das 11 Sep '23

11 Sep '23

Simpilfy probe() by replacing of_device_get_match_data() and id lookup for retrieving match data by i2c_get_match_data() and replace dev_err()->dev_err_probe(). While at it, drop local variable np and use dev_fwnode() instead and remove comma in the terminator entry. Signed-off-by: Biju Das <biju.das.jz(a)bp.renesas.com> --- Note: This patch is only compile tested. v1->v2: * Removed forward declaration ak4642_of_match and ak4642_i2c_id. * Restored error EINVAL. * Used dev_fwnode() and replaced dev->of_node. * Removed comma in the terminator entry. --- sound/soc/codecs/ak4642.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 2a8984c1fa9c..8a40c6b3f4d8 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -628,37 +628,23 @@ static struct clk *ak4642_of_parse_mcko(struct device *dev) #define ak4642_of_parse_mcko(d) 0 #endif -static const struct of_device_id ak4642_of_match[]; -static const struct i2c_device_id ak4642_i2c_id[]; static int ak4642_i2c_probe(struct i2c_client *i2c) { struct device *dev = &i2c->dev; - struct device_node *np = dev->of_node; - const struct ak4642_drvdata *drvdata = NULL; + const struct ak4642_drvdata *drvdata; struct regmap *regmap; struct ak4642_priv *priv; struct clk *mcko = NULL; - if (np) { - const struct of_device_id *of_id; - + if (dev_fwnode(dev)) { mcko = ak4642_of_parse_mcko(dev); if (IS_ERR(mcko)) mcko = NULL; - - of_id = of_match_device(ak4642_of_match, dev); - if (of_id) - drvdata = of_id->data; - } else { - const struct i2c_device_id *id = - i2c_match_id(ak4642_i2c_id, i2c); - drvdata = (const struct ak4642_drvdata *)id->driver_data; } - if (!drvdata) { - dev_err(dev, "Unknown device type\n"); - return -EINVAL; - } + drvdata = i2c_get_match_data(i2c); + if (!drvdata) + return dev_err_probe(dev, -EINVAL, "Unknown device type\n"); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -681,7 +667,7 @@ static const struct of_device_id ak4642_of_match[] = { { .compatible = "asahi-kasei,ak4642", .data = &ak4642_drvdata}, { .compatible = "asahi-kasei,ak4643", .data = &ak4643_drvdata}, { .compatible = "asahi-kasei,ak4648", .data = &ak4648_drvdata}, - {}, + {} }; MODULE_DEVICE_TABLE(of, ak4642_of_match); @@ -689,7 +675,7 @@ static const struct i2c_device_id ak4642_i2c_id[] = { { "ak4642", (kernel_ulong_t)&ak4642_drvdata }, { "ak4643", (kernel_ulong_t)&ak4643_drvdata }, { "ak4648", (kernel_ulong_t)&ak4648_drvdata }, - { } + {} }; MODULE_DEVICE_TABLE(i2c, ak4642_i2c_id); -- 2.25.1

3 5

[PATCH v2] ASoC: cs42xx8-i2c: Simplify probe()
by Biju Das 11 Sep '23

11 Sep '23

Simplify probe() by replacing of_match_device->i2c_get_match_data() and extend matching support for ID table. Also replace dev_err()->dev_err_probe() to simplify the code. Signed-off-by: Biju Das <biju.das.jz(a)bp.renesas.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Note: This patch is only compile tested. v1->v2: * Added Ack from Charles Keepax. * Restored the error EINVAL. --- sound/soc/codecs/cs42xx8-i2c.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c index a422472820fb..9028c0f0fe77 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -18,21 +18,15 @@ #include "cs42xx8.h" -static const struct of_device_id cs42xx8_of_match[]; - static int cs42xx8_i2c_probe(struct i2c_client *i2c) { int ret; struct cs42xx8_driver_data *drvdata; - const struct of_device_id *of_id; - - of_id = of_match_device(cs42xx8_of_match, &i2c->dev); - if (!of_id) { - dev_err(&i2c->dev, "failed to find driver data\n"); - return -EINVAL; - } - drvdata = (struct cs42xx8_driver_data *)of_id->data; + drvdata = (struct cs42xx8_driver_data *)i2c_get_match_data(i2c); + if (!drvdata) + return dev_err_probe(&i2c->dev, -EINVAL, + "failed to find driver data\n"); ret = cs42xx8_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config), drvdata); -- 2.25.1

3 3