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

[PATCH v2] ALSA: hda/tas2781: correct the register for pow calibrated data
by Shenghao Ding 04 Apr '24

04 Apr '24

Fixes: 5be27f1e3ec9 ("ALSA: hda/tas2781: Add tas2781 HDA driver") Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- v2: - Add Fixes tag - To add a trailing comma will help in case of extending this in the future. --- sound/pci/hda/tas2781_hda_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 48dae3339305..75f7674c66ee 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -514,10 +514,10 @@ static int tas2563_save_calibration(struct tasdevice_priv *tas_priv) static void tas2781_apply_calib(struct tasdevice_priv *tas_priv) { static const unsigned char page_array[CALIB_MAX] = { - 0x17, 0x18, 0x18, 0x0d, 0x18 + 0x17, 0x18, 0x18, 0x13, 0x18, }; static const unsigned char rgno_array[CALIB_MAX] = { - 0x74, 0x0c, 0x14, 0x3c, 0x7c + 0x74, 0x0c, 0x14, 0x70, 0x7c, }; unsigned char *data; int i, j, rc; -- 2.34.1

2 1

[PATCH] ASoC: rt5645: Fix the electric noise due to the CBJ contacts floating
by derek.fang＠realtek.com 04 Apr '24

04 Apr '24

From: Derek Fang <derek.fang(a)realtek.com> The codec leaves tie combo jack's sleeve/ring2 to floating status default. It would cause electric noise while connecting the active speaker jack during boot or shutdown. This patch requests a gpio to control the additional jack circuit to tie the contacts to the ground or floating. Signed-off-by: Derek Fang <derek.fang(a)realtek.com> diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index e3ba04484813..d0d24a53df74 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -444,6 +444,7 @@ struct rt5645_priv { struct regmap *regmap; struct i2c_client *i2c; struct gpio_desc *gpiod_hp_det; + struct gpio_desc *gpiod_cbj_sleeve; struct snd_soc_jack *hp_jack; struct snd_soc_jack *mic_jack; struct snd_soc_jack *btn_jack; @@ -3186,6 +3187,9 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_inse regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL2, RT5645_CBJ_MN_JD, 0); + if (rt5645->gpiod_cbj_sleeve) + gpiod_set_value(rt5645->gpiod_cbj_sleeve, 1); + msleep(600); regmap_read(rt5645->regmap, RT5645_IN1_CTRL3, &val); val &= 0x7; @@ -3202,6 +3206,8 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_inse snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); snd_soc_dapm_sync(dapm); rt5645->jack_type = SND_JACK_HEADPHONE; + if (rt5645->gpiod_cbj_sleeve) + gpiod_set_value(rt5645->gpiod_cbj_sleeve, 0); } if (rt5645->pdata.level_trigger_irq) regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, @@ -3229,6 +3235,9 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_inse if (rt5645->pdata.level_trigger_irq) regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV); + + if (rt5645->gpiod_cbj_sleeve) + gpiod_set_value(rt5645->gpiod_cbj_sleeve, 0); } return rt5645->jack_type; @@ -4012,6 +4021,16 @@ static int rt5645_i2c_probe(struct i2c_client *i2c) return ret; } + rt5645->gpiod_cbj_sleeve = devm_gpiod_get_optional(&i2c->dev, "cbj-sleeve", + GPIOD_OUT_LOW); + + if (IS_ERR(rt5645->gpiod_cbj_sleeve)) { + ret = PTR_ERR(rt5645->gpiod_cbj_sleeve); + dev_info(&i2c->dev, "failed to initialize gpiod, ret=%d\n", ret); + if (ret != -ENOENT) + return ret; + } + for (i = 0; i < ARRAY_SIZE(rt5645->supplies); i++) rt5645->supplies[i].supply = rt5645_supply_names[i]; @@ -4259,6 +4278,9 @@ static void rt5645_i2c_remove(struct i2c_client *i2c) cancel_delayed_work_sync(&rt5645->jack_detect_work); cancel_delayed_work_sync(&rt5645->rcclock_work); + if (rt5645->gpiod_cbj_sleeve) + gpiod_set_value(rt5645->gpiod_cbj_sleeve, 0); + regulator_bulk_disable(ARRAY_SIZE(rt5645->supplies), rt5645->supplies); } @@ -4274,6 +4296,9 @@ static void rt5645_i2c_shutdown(struct i2c_client *i2c) 0); msleep(20); regmap_write(rt5645->regmap, RT5645_RESET, 0); + + if (rt5645->gpiod_cbj_sleeve) + gpiod_set_value(rt5645->gpiod_cbj_sleeve, 0); } static int __maybe_unused rt5645_sys_suspend(struct device *dev) -- 2.34.1

2 1

[PATCH 0/5] ALSA: cirrus: Tidy up of firmware control read/write
by Richard Fitzgerald 03 Apr '24

03 Apr '24

This set of patches factors out some repeated code to clean up firmware control read/write functions, and removes some redundant control notification code. Simon Trimmer (5): firmware: cs_dsp: Add locked wrappers for coeff read and write ASoC: wm_adsp: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() ALSA: hda: hda_cs_dsp_ctl: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() ASoC: wm_adsp: Remove notification of driver write ALSA: hda: hda_cs_dsp_ctl: Remove notification of driver write drivers/firmware/cirrus/cs_dsp.c | 54 ++++++++++++++++++++++++++ include/linux/firmware/cirrus/cs_dsp.h | 4 ++ sound/pci/hda/hda_cs_dsp_ctl.c | 22 +---------- sound/soc/codecs/wm_adsp.c | 32 ++++----------- 4 files changed, 67 insertions(+), 45 deletions(-) -- 2.39.2

3 9

[PATCH] dt-bindings: omap-mcpdm: Convert to DT schema
by Mighty 03 Apr '24

03 Apr '24

Convert the OMAP4+ McPDM bindings to DT schema. Signed-off-by: Mighty <bavishimithil(a)gmail.com> --- .../devicetree/bindings/sound/omap-mcpdm.txt | 30 ---------- .../devicetree/bindings/sound/omap-mcpdm.yaml | 58 +++++++++++++++++++ 2 files changed, 58 insertions(+), 30 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/omap-mcpdm.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-mcpdm.yaml diff --git a/Documentation/devicetree/bindings/sound/omap-mcpdm.txt b/Documentation/devicetree/bindings/sound/omap-mcpdm.txt deleted file mode 100644 index ff98a0cb5..000000000 --- a/Documentation/devicetree/bindings/sound/omap-mcpdm.txt +++ /dev/null @@ -1,30 +0,0 @@ -* Texas Instruments OMAP4+ McPDM - -Required properties: -- compatible: "ti,omap4-mcpdm" -- reg: Register location and size as an array: - <MPU access base address, size>, - <L3 interconnect address, size>; -- interrupts: Interrupt number for McPDM -- ti,hwmods: Name of the hwmod associated to the McPDM -- clocks: phandle for the pdmclk provider, likely <&twl6040> -- clock-names: Must be "pdmclk" - -Example: - -mcpdm: mcpdm@40132000 { - compatible = "ti,omap4-mcpdm"; - reg = <0x40132000 0x7f>, /* MPU private access */ - <0x49032000 0x7f>; /* L3 Interconnect */ - interrupts = <0 112 0x4>; - interrupt-parent = <&gic>; - ti,hwmods = "mcpdm"; -}; - -In board DTS file the pdmclk needs to be added: - -&mcpdm { - clocks = <&twl6040>; - clock-names = "pdmclk"; - status = "okay"; -}; diff --git a/Documentation/devicetree/bindings/sound/omap-mcpdm.yaml b/Documentation/devicetree/bindings/sound/omap-mcpdm.yaml new file mode 100644 index 000000000..8c9ff9d90 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/omap-mcpdm.yaml @@ -0,0 +1,58 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/omap-mcpdm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: OMAP McPDM + +maintainers: + - Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> + +description: + OMAP ALSA SoC DAI driver using McPDM port used by TWL6040 + +properties: + compatible: + const: ti,omap4-mcpdm + + reg: + description: 'Register location and size as an array: + <MPU access base address, size>, + <L3 interconnect address, size>;' + + interrupts: + description: Interrupt number for McPDM + + ti,hwmods: + description: Name of the hwmod associated to the McPDM + + clocks: + description: phandle for the pdmclk provider, likely <&twl6040> + + clock-names: + description: Must be "pdmclk" + + +required: + - compatible + - reg + - interrupts + - ti,hwmods + - clocks + - clock-names + +additionalProperties: false + +examples: + - | + mcpdm: mcpdm@40132000 { + compatible = "ti,omap4-mcpdm"; + reg = <0x40132000 0x7f>, /* MPU private access */ + <0x49032000 0x7f>; /* L3 Interconnect */ + interrupts = <0 112 0x4>; + interrupt-parent = <&gic>; + ti,hwmods = "mcpdm"; + clocks = <&twl6040>; + clock-names = "pdmclk"; + }; -- 2.34.1

2 1

[PATCH 00/10] Use const where applicable
by Amadeusz Sławiński 03 Apr '24

03 Apr '24

Use devm_kstrdup_const in few places to possibly save a bit of memory. Mark some of the structs as const, as they are not modified and used as is. Amadeusz Sławiński (10): ASoC: Intel: avs: hdaudio: Use devm_kstrdup_const ASoC: Intel: avs: Use devm_kstrdup_const ASoC: Intel: avs: hdaudio: Constify probing_link ASoC: Intel: avs: es8336: Constify card_headset_pins ASoC: Intel: avs: nau8825: Constify card_headset_pins ASoC: Intel: avs: rt274: Constify card_headset_pins ASoC: Intel: avs: rt286: Constify card_headset_pins ASoC: Intel: avs: rt298: Constify card_headset_pins ASoC: Intel: avs: rt5663: Constify card_headset_pins ASoC: Intel: avs: rt5682: Constify card_headset_pins sound/soc/intel/avs/avs.h | 2 +- sound/soc/intel/avs/boards/es8336.c | 2 +- sound/soc/intel/avs/boards/hdaudio.c | 6 +++--- sound/soc/intel/avs/boards/nau8825.c | 2 +- sound/soc/intel/avs/boards/rt274.c | 2 +- sound/soc/intel/avs/boards/rt286.c | 2 +- sound/soc/intel/avs/boards/rt298.c | 2 +- sound/soc/intel/avs/boards/rt5663.c | 2 +- sound/soc/intel/avs/boards/rt5682.c | 2 +- sound/soc/intel/avs/utils.c | 8 ++++---- 10 files changed, 15 insertions(+), 15 deletions(-) base-commit: 36d464cba8bdfd268282a97e9fdc701aca2ed8cb -- 2.34.1

2 11

[PATCH 0/5] ASoC: rsnd: reg cleanup
by Kuninori Morimoto 03 Apr '24

03 Apr '24

Hi Mark These are Renesas Sound driver cleanups for Gen3/Gen4. Kuninori Morimoto (5): ASoC: rsnd: cleanup regmap table ASoC: rsnd: don't get resource from ID ASoC: rsnd: rename rsnd_is_e3() to rsnd_is_gen3_e3() ASoC: rsnd: R-Car Gen1/Gen2 exception ASoC: rsnd: no exception for SCU sound/soc/sh/rcar/cmd.c | 6 +- sound/soc/sh/rcar/core.c | 4 +- sound/soc/sh/rcar/ctu.c | 6 +- sound/soc/sh/rcar/dma.c | 6 +- sound/soc/sh/rcar/dvc.c | 6 +- sound/soc/sh/rcar/gen.c | 519 +++++++++++++++++---------------------- sound/soc/sh/rcar/mix.c | 6 +- sound/soc/sh/rcar/rsnd.h | 22 +- sound/soc/sh/rcar/src.c | 12 +- sound/soc/sh/rcar/ssi.c | 2 +- sound/soc/sh/rcar/ssiu.c | 2 +- 11 files changed, 247 insertions(+), 344 deletions(-) -- 2.25.1

2 6

[PATCH v1] ALSA: hda/tas2781: correct the register for pow calibrated data
by Shenghao Ding 03 Apr '24

03 Apr '24

fixed tas2781 calibrated data - pow was written into a wrong register. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- sound/pci/hda/tas2781_hda_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 48dae3339305..116821ae3cb3 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -514,10 +514,10 @@ static int tas2563_save_calibration(struct tasdevice_priv *tas_priv) static void tas2781_apply_calib(struct tasdevice_priv *tas_priv) { static const unsigned char page_array[CALIB_MAX] = { - 0x17, 0x18, 0x18, 0x0d, 0x18 + 0x17, 0x18, 0x18, 0x13, 0x18 }; static const unsigned char rgno_array[CALIB_MAX] = { - 0x74, 0x0c, 0x14, 0x3c, 0x7c + 0x74, 0x0c, 0x14, 0x70, 0x7c }; unsigned char *data; int i, j, rc; -- 2.34.1

2 1

[PATCH 00/17] ASoC: SOF: Intel: improve SoundWire support for LunarLake
by Pierre-Louis Bossart 03 Apr '24

03 Apr '24

This patchset contains important updates for SoundWire support. We initially implemented support for multiple amplifiers on different links using a single HDaudio DMA transfer. To align with the other OS, the 'aggregation' is now supported by the firmware. This change in directions has kernel impacts, since we now have multiple HDaudio DMAs to program and start, but since there are no platforms released so far there's no end-user impact. In addition, the behavior in case of xruns is improved by clearing the PCM states and better handling of the hw_free case. Note that the hw_free support will compile but will only be functional with the companion patch "soundwire: intel: add intel_free_stream() back" already applied in the SoundWire tree. Bard Liao (5): Revert "ASoC: SOF: Intel: hda-dai-ops: reset device count for SoundWire DAIs" Revert "ASoC: SOF: Intel: hda-dai-ops: only allocate/release streams for first CPU DAI" ASoC: SOF: make dma_config_tlv be an array ASoC: SOF: Intel: hda-dai: set lowest N bits in ch_mask ASoC: SOF: Intel: hda-dai: set dma_stream_channel_map device Pierre-Louis Bossart (10): ASoC: SOF: Intel: hda-dai: fix channel map configuration for aggregated dailink ASoC: SOF: Intel: hda-dai: add helpers to set dai config ASoC: SOF: Intel: set the DMA TLV device as dai_index ASoC: SOF: Intel: hda: extend signature of sdw_hda_dai_hw_params() ASoC: SOF: IPC4: extend dai_data with node_id ASoC: SOF: Intel: hda: move helper to static inline ASoC: SOF: sof-audio: revisit sof_pcm_stream_free() error handling and logs ASoC: SOF: pcm: simplify sof_pcm_hw_free() with helper ASoC: SOF: pcm: add pending_stop state variable ASoC: SOF: pcm: reset all PCM sources in case of xruns Ranjani Sridharan (2): ASoC: SOF: Intel: hda: Clear Soundwire node ID during BE DAI hw_free ASoC: SOF: ipc4-topology: Save the ALH DAI index during hw_params sound/soc/sof/intel/hda-dai-ops.c | 41 +--------- sound/soc/sof/intel/hda-dai.c | 124 +++++++++++++++++++++++------- sound/soc/sof/intel/hda.c | 29 ++++++- sound/soc/sof/intel/hda.h | 11 ++- sound/soc/sof/ipc4-topology.c | 62 ++++++++++----- sound/soc/sof/ipc4-topology.h | 3 +- sound/soc/sof/pcm.c | 58 +++++++------- sound/soc/sof/sof-audio.c | 29 +++++-- sound/soc/sof/sof-audio.h | 2 + 9 files changed, 232 insertions(+), 127 deletions(-) -- 2.40.1

2 18

[PATCH 0/4] ASoC: SOF: cppcheck fixes and debugfs addition
by Pierre-Louis Bossart 03 Apr '24

03 Apr '24

Small changes with 3 cppcheck fixes and the firmware version now visible with debugfs instead of only via dmesg logs. Pierre-Louis Bossart (3): ASoC: SOF: amd: acp-loader: abort firmware download on write error ASoC: SOF: ipc4-priv: align prototype and function declaration ASoC: SOF: ipc4-topology: remove shadowed variable Yong Zhi (1): ASoC: SOF: ipc4-loader: save FW version info to debugfs sound/soc/sof/amd/acp-loader.c | 2 ++ sound/soc/sof/ipc4-loader.c | 8 ++++++++ sound/soc/sof/ipc4-priv.h | 2 +- sound/soc/sof/ipc4-topology.c | 1 - 4 files changed, 11 insertions(+), 2 deletions(-) -- 2.40.1

2 5

[PATCH v2 0/3] ASoC: Use snd_ctl_find_id_mixer() instead of open-coding
by Richard Fitzgerald 03 Apr '24

03 Apr '24

The first two patches change snd_soc_card_get_kcontrol() to use the core snd_ctl_find_id_mixer() functionality instead of open-coding its own list walk. The last patch adds a KUnit test for this, which was tested on the original and modified code. Changes in V2: Only change is in the KUnit test (patch #3) to make the const strings more consty. Richard Fitzgerald (3): ALSA: control: Introduce snd_ctl_find_id_mixer_locked() ASoC: soc-card: Use snd_ctl_find_id_mixer() instead of open-coding ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol include/sound/control.h | 23 +++++ sound/soc/Kconfig | 8 ++ sound/soc/Makefile | 4 + sound/soc/soc-card-test.c | 184 ++++++++++++++++++++++++++++++++++++++ sound/soc/soc-card.c | 21 +---- 5 files changed, 223 insertions(+), 17 deletions(-) create mode 100644 sound/soc/soc-card-test.c -- 2.39.2

3 5