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

[PATCH v1 0/3] ASoC: atmel: Fixes for AT91SAM9G20-EK audio driver
by Mark Brown 05 Apr '22

05 Apr '22

At some point the machine driver for the audio subsystem on the AT91SAM9G20-EK appears to have bitrotted, no longer probing due to effects of the transition to the common clock framework. The first patch in this series fixes the initial probe problem, with the rest of the series being random other fixes and cleanups I noticed while looking at the driver. Mark Brown (3): ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek ASoC: atmel: Fix error handling in at91samg20ek probe() ASoC: atmel: Don't squash error codes from atmel_ssc_set_audio() sound/soc/atmel/sam9g20_wm8731.c | 74 ++++---------------------------- 1 file changed, 8 insertions(+), 66 deletions(-) base-commit: f590797fa3c1bccdd19e55441592a23b46aef449 -- 2.30.2

2 8

[PATCH 1/2] ASoC: cs35l41: Add one more variable in the debug log
by Hui Wang 05 Apr '22

05 Apr '22

otp_map[].size is a key variable to compute the value of otp_val and to update the bit_offset, it is helpful to debug if could put it in the debug log. Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/soc/codecs/cs35l41-lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs35l41-lib.c b/sound/soc/codecs/cs35l41-lib.c index e5a56bcbb223..d0a480c40231 100644 --- a/sound/soc/codecs/cs35l41-lib.c +++ b/sound/soc/codecs/cs35l41-lib.c @@ -822,8 +822,8 @@ int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap) word_offset = otp_map_match->word_offset; for (i = 0; i < otp_map_match->num_elements; i++) { - dev_dbg(dev, "bitoffset= %d, word_offset=%d, bit_sum mod 32=%d\n", - bit_offset, word_offset, bit_sum % 32); + dev_dbg(dev, "bitoffset= %d, word_offset=%d, bit_sum mod 32=%d otp_map[i].size = %d\n", + bit_offset, word_offset, bit_sum % 32, otp_map[i].size); if (bit_offset + otp_map[i].size - 1 >= 32) { otp_val = (otp_mem[word_offset] & GENMASK(31, bit_offset)) >> bit_offset; -- 2.25.1

3 5

[PATCH v4 0/6] ASoC: mediatek: Add support for MT8195 sound card with max98390 and rt5682
by Trevor Wu 05 Apr '22

05 Apr '22

This series of patches adds support for mt8195 board with mt6359, max98390 and rt5682. To prevent from copy-paste components, mt8195 machine drivers and dt-bindings are merged in the patch. Patches are based on broonie tree "for-next" branch. Changes since v3: - apply some suggested changes from reviewers Changes since v2: - split "merge machine driver" into two parts for better understanding Changes since v1: - remove merged patches about reset controller - propose a common machine driver instead of machine driver common code - propose a common dt-bindings for mt8195 sound card Trevor Wu (6): ASoC: mediatek: mt8195: revise mt8195-mt6359-rt1019-rt5682.c ASoC: mediatek: mt8195: merge machine driver ASoC: dt-bindings: mediatek: mt8195: merge mt8195 machine yaml ASoC: mediatek: mt8195: rename card controls ASoC: mediatek: mt8195: add machine support for max98390 and rt5682 ASoC: dt-bindings: mediatek: mt8195: support mt8195-mt6359-max98390-rt5682 .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 - ...-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 9 +- sound/soc/mediatek/Kconfig | 26 +- sound/soc/mediatek/mt8195/Makefile | 3 +- .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 1198 ----------------- ...mt6359-rt1019-rt5682.c => mt8195-mt6359.c} | 862 +++++++----- 6 files changed, 566 insertions(+), 1583 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%) delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (78%) -- 2.18.0

6 16

[PATCH] ASoC: intel: atom: Remove superfluous flush_scheduled_work()
by Takashi Iwai 05 Apr '22

05 Apr '22

It seems that flush_scheduled_work() is called without any real purpose at sst_context_cleanup() (the driver doesn't put works on the global queue at all). As the flush_schedule_work() function is going to be abolished in near future, let's drop it now. Cc: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/intel/atom/sst/sst.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c index e21e11dac000..3a42d68c0247 100644 --- a/sound/soc/intel/atom/sst/sst.c +++ b/sound/soc/intel/atom/sst/sst.c @@ -360,7 +360,6 @@ void sst_context_cleanup(struct intel_sst_drv *ctx) sst_unregister(ctx->dev); sst_set_fw_state_locked(ctx, SST_SHUTDOWN); sysfs_remove_group(&ctx->dev->kobj, &sst_fw_version_attr_group); - flush_scheduled_work(); destroy_workqueue(ctx->post_msg_wq); cpu_latency_qos_remove_request(ctx->qos); kfree(ctx->fw_sg_list.src); -- 2.31.1

4 4

[PATCH] ASoC: codecs: Fix error handling in power domain init and exit handlers
by Srinivasa Rao Mandadapu 05 Apr '22

05 Apr '22

Update error handling in power domain init and exit handlers, as existing handling may cause issues in device remove function. Use appropriate pm core api for power domain get and sync to avoid redundant code. Fixes: 9e3d83c52844 ("ASoC: codecs: Add power domains support in digital macro codecs") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Co-developed-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> Signed-off-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> Reported-by: kernel test robot <lkp(a)intel.com> Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/codecs/lpass-macro-common.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/lpass-macro-common.c b/sound/soc/codecs/lpass-macro-common.c index 6cede75..3c661fd 100644 --- a/sound/soc/codecs/lpass-macro-common.c +++ b/sound/soc/codecs/lpass-macro-common.c @@ -24,42 +24,45 @@ struct lpass_macro *lpass_macro_pds_init(struct device *dev) return ERR_PTR(-ENOMEM); l_pds->macro_pd = dev_pm_domain_attach_by_name(dev, "macro"); - if (IS_ERR_OR_NULL(l_pds->macro_pd)) - return NULL; - - ret = pm_runtime_get_sync(l_pds->macro_pd); - if (ret < 0) { - pm_runtime_put_noidle(l_pds->macro_pd); + if (IS_ERR_OR_NULL(l_pds->macro_pd)) { + ret = PTR_ERR(l_pds->macro_pd); goto macro_err; } + ret = pm_runtime_resume_and_get(l_pds->macro_pd); + if (ret < 0) + goto macro_sync_err; + l_pds->dcodec_pd = dev_pm_domain_attach_by_name(dev, "dcodec"); - if (IS_ERR_OR_NULL(l_pds->dcodec_pd)) + if (IS_ERR_OR_NULL(l_pds->dcodec_pd)) { + ret = PTR_ERR(l_pds->dcodec_pd); goto dcodec_err; + } - ret = pm_runtime_get_sync(l_pds->dcodec_pd); - if (ret < 0) { - pm_runtime_put_noidle(l_pds->dcodec_pd); + ret = pm_runtime_resume_and_get(l_pds->dcodec_pd); + if (ret < 0) goto dcodec_sync_err; - } return l_pds; dcodec_sync_err: dev_pm_domain_detach(l_pds->dcodec_pd, false); dcodec_err: pm_runtime_put(l_pds->macro_pd); -macro_err: +macro_sync_err: dev_pm_domain_detach(l_pds->macro_pd, false); +macro_err: return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(lpass_macro_pds_init); void lpass_macro_pds_exit(struct lpass_macro *pds) { - pm_runtime_put(pds->macro_pd); - dev_pm_domain_detach(pds->macro_pd, false); - pm_runtime_put(pds->dcodec_pd); - dev_pm_domain_detach(pds->dcodec_pd, false); + if (pds) { + pm_runtime_put(pds->macro_pd); + dev_pm_domain_detach(pds->macro_pd, false); + pm_runtime_put(pds->dcodec_pd); + dev_pm_domain_detach(pds->dcodec_pd, false); + } } EXPORT_SYMBOL_GPL(lpass_macro_pds_exit); -- 2.7.4

2 1

[PATCH 1/3] ASoC: Intel: catpt: remove check of list iterator against head past the loop body
by Jakob Koschel 05 Apr '22

05 Apr '22

When list_for_each_entry() completes the iteration over the whole list without breaking the loop, the iterator value will be a bogus pointer computed based on the head element. While it is safe to use the pointer to determine if it was computed based on the head element, either with list_entry_is_head() or &pos->member == head, using the iterator variable after the loop should be avoided. In preparation to limiting the scope of a list iterator to the list traversal loop, use a dedicated pointer to point to the found element [1]. Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cW… [1] Signed-off-by: Jakob Koschel <jakobkoschel(a)gmail.com> --- sound/soc/intel/catpt/pcm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c index a26000cd5ceb..b103b2d4026e 100644 --- a/sound/soc/intel/catpt/pcm.c +++ b/sound/soc/intel/catpt/pcm.c @@ -330,7 +330,8 @@ static int catpt_dai_apply_usettings(struct snd_soc_dai *dai, struct catpt_stream_runtime *stream) { struct snd_soc_component *component = dai->component; - struct snd_kcontrol *pos; + struct snd_kcontrol *pos = NULL; + struct snd_kcontrol *iter; struct catpt_dev *cdev = dev_get_drvdata(dai->dev); const char *name; int ret; @@ -354,12 +355,14 @@ static int catpt_dai_apply_usettings(struct snd_soc_dai *dai, return 0; } - list_for_each_entry(pos, &component->card->snd_card->controls, list) { - if (pos->private_data == component && - !strncmp(name, pos->id.name, sizeof(pos->id.name))) + list_for_each_entry(iter, &component->card->snd_card->controls, list) { + if (iter->private_data == component && + !strncmp(name, iter->id.name, sizeof(iter->id.name))) { + pos = iter; break; + } } - if (list_entry_is_head(pos, &component->card->snd_card->controls, list)) + if (!pos) return -ENOENT; if (stream->template->type != CATPT_STRM_TYPE_LOOPBACK) base-commit: f82da161ea75dc4db21b2499e4b1facd36dab275 -- 2.25.1

4 5

simple-audio-card
by Jiří Prchal 05 Apr '22

05 Apr '22

Hi everybody, would be someone so kind and help me with my sound card? My connection is: cpu AT91SAM9G25 I2S (SSC0) --> codec TLV320AIC3106 <-- clock 12MHz Codec is clock master. dts related parts: sound { compatible = "simple-audio-card"; simple-audio-card,name = "TLV320AIC3106"; simple-audio-card,widgets = "Headphone", "Front Out", "Line", "Rear Out", "Line", "GSM Out", "Speaker", "Speaker", "Microphone", "Front In", "Line", "Rear In", "Line", "GSM In"; simple-audio-card,routing = "Front Out", "HPLOUT", "Rear Out", "HPROUT", "GSM Out", "LLOUT", "SP_AMP INL", "MONO_LOUT", "Speaker", "SP_AMP OUTL", "MIC3L", "Front In", "LINE1R", "Rear In", "LINE1L", "GSM In"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound_master>; simple-audio-card,frame-master = <&sound_master>; simple-audio-card,aux-devs = <&speaker_amp>; simple-audio-card,cpu { sound-dai = <&ssc0>; }; sound_master: simple-audio-card,codec { sound-dai = <&tlv320aic3106>; system-clock-frequency = <12000000>; }; }; &ssc0 { #sound-dai-cells = <0>; status = "okay"; pinctrl-0 = <&pinctrl_ssc0_tx_rx>; }; &spi0 { status = "okay"; cs-gpios = <&pioA 22 0 &pioC 14 0 &pioC 29 0 &pioA 4 0>; tlv320aic3106: codec@3 { compatible = "ti,tlv320aic3106"; reg = <3>; spi-max-frequency = <1000000>; #sound-dai-cells = <0>; adc-settle-ms = <40>; ai3x-micbias-vg = <2>; /* 2.5V */ status = "okay"; DRVDD-supply = <&vcc_3v3>; AVDD-supply = <&vcc_3v3>; IOVDD-supply = <&vcc_3v3>; DVDD-supply = <&vcc_1v8>; ai3x-ocmv = <2>; /* 1.65V */ }; }; In kernel 5.12 it worked fine, but I can't make it in either 5.15 or 5.17. dmesg doesn't help at all, even with debug compilation switch: ... [ 1.203333] ssc f0010000.ssc: Atmel SSC device at 0x(ptrval) (irq 22) ... [ 1.616666] atmel_spi f0000000.spi: Using dma0chan2 (tx) and dma0chan3 (rx) for DMA transfers ... [ 1.639999] codec@3 enforce active low on chipselect handle [ 1.656666] at25 spi0.0: 128 KByte fm25 fram, pagesize 4096 [ 1.696666] atmel_spi f0000000.spi: Atmel SPI Controller version 0x212 at 0xf0000000 (irq 28) ... [ 3.033333] ALSA device list: [ 3.036666] No soundcards found. The only difference in 5.12 is: [ 3.869999] ALSA device list: [ 3.876666] #0: TLV320AIC3106 So, what's wrong? Thanks Jiri

1 1

[PATCH -next] soundwire: stream: Fix error return code in do_bank_switch()
by Wang Wensheng 05 Apr '22

05 Apr '22

Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wang Wensheng <wangwensheng4(a)huawei.com> --- drivers/soundwire/stream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 980f26d49b66..553131597af6 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -822,6 +822,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) } else if (multi_link) { dev_err(bus->dev, "Post bank switch ops not implemented\n"); + ret = -EINVAL; goto error; } -- 2.17.1

3 2

[PATCH] soundwire: qcom: fix an error message in swrm_wait_for_frame_gen_enabled()
by Dan Carpenter 05 Apr '22

05 Apr '22

The logical AND && is supposed to be bitwise AND & so it will sometimes print "connected" instead of "disconnected". Fixes: 74e79da9fd46 ("soundwire: qcom: add runtime pm support") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- drivers/soundwire/qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index f613a41c278a..6ca041f9e449 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1452,7 +1452,7 @@ static bool swrm_wait_for_frame_gen_enabled(struct qcom_swrm_ctrl *swrm) } while (retry--); dev_err(swrm->dev, "%s: link status not %s\n", __func__, - comp_sts && SWRM_FRM_GEN_ENABLED ? "connected" : "disconnected"); + comp_sts & SWRM_FRM_GEN_ENABLED ? "connected" : "disconnected"); return false; } -- 2.20.1

2 1

[RESEND v7 0/2] Add support for SoundWire1.6 audio cgcr register control
by Srinivasa Rao Mandadapu 05 Apr '22

05 Apr '22

This patch series is to add v1.6.0 compatible name for qcom soundwire driver and corresponding dt bindings. Changes Since V6: -- Update commit message -- Update Example with reset control in dt bindings. Changes Since V5: -- Constify static struct qcom_swrm_data global variables. -- Remove redundant swrm_v1_6_data variable. Changes Since V4: -- Dropped audio cgcr control patch due to dependency on clock patches. -- Update dt-bindings as per new reset control properties. Changes Since V3: -- Add v1.6.0 compatible name and soundwire data structure. -- Change macro define name properly. -- Update bindings for new property. -- Change commit message description. -- Change signedoff by sequence. Changes since v2: -- Update error check after ioremap. Changes since v1: -- Add const name to mask value. Srinivasa Rao Mandadapu (2): soundwire: qcom: Add compatible name for v1.6.0 dt-bindings: soundwire: qcom: Add bindings for audio clock reset control property Documentation/devicetree/bindings/soundwire/qcom,sdw.txt | 14 ++++++++++++++ drivers/soundwire/qcom.c | 1 + 2 files changed, 15 insertions(+) -- 2.7.4

3 5