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

[PATCH] ASoC: samsung: midas_wm1811: Fix 'Headphone Switch' control creation
by Marek Szyprowski 09 Aug '23

09 Aug '23

'Headphone Switch' control is already registered from sound/soc/codecs/wm_hubs.c:479, so duplicating it in midas_wm1811 causes following probe failure: midas-audio sound: control 2:0:0:Headphone Switch:0 is already present midas-audio sound: ASoC: Failed to add Headphone Switch: -16 midas-audio sound: Failed to register card: -16 midas-audio: probe of sound failed with error -16 Fix this by dropping duplicated control. Fixes: d27224a45e54 ("ASoC: samsung: midas_wm1811: Map missing jack kcontrols") Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- sound/soc/samsung/midas_wm1811.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c index 44b32f5cddca..126098fdcf1b 100644 --- a/sound/soc/samsung/midas_wm1811.c +++ b/sound/soc/samsung/midas_wm1811.c @@ -257,7 +257,6 @@ static const struct snd_kcontrol_new midas_controls[] = { SOC_DAPM_PIN_SWITCH("Main Mic"), SOC_DAPM_PIN_SWITCH("Sub Mic"), SOC_DAPM_PIN_SWITCH("Headset Mic"), - SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("FM In"), }; -- 2.34.1

2 1

[PATCH] ASoC: rsnd: call of_node_put() when break
by Kuninori Morimoto 09 Aug '23

09 Aug '23

We need to call of_node_put() when break from for_each_child_of_node(). This patch add missing of_node_put(). Reported-by: kernel test robot <lkp(a)intel.com> Reported-by: Julia Lawall <julia.lawall(a)inria.fr> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 069add7b1b71..e29c2fee9521 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1282,6 +1282,7 @@ static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph) i++; if (i >= RSND_MAX_COMPONENT) { dev_info(dev, "reach to max component\n"); + of_node_put(node); break; } } @@ -1301,6 +1302,7 @@ static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph) i++; if (i >= RSND_MAX_COMPONENT) { dev_info(dev, "reach to max component\n"); + of_node_put(node); break; } } -- 2.25.1

2 1

[PATCH 0/5] ASoC: cs35l56: Bugfixes
by Richard Fitzgerald 09 Aug '23

09 Aug '23

Miscellaneous bugfixes for the cs35l56 codec driver. Richard Fitzgerald (3): ASoC: cs35l56: Avoid uninitialized variable in cs35l56_set_asp_slot_positions() ASoC: cs35l56: Don't rely on GPIOD_OUT_LOW to set RESET initially low ASoC: cs35l56: Wait for control port ready during system-resume Simon Trimmer (2): ASoC: wm_adsp: Expose the DSP power down actions as wm_adsp_power_down() ASoC: cs35l56: Call wm_adsp_power_down() before reloading firmware sound/soc/codecs/cs35l56.c | 33 +++++++++++++++++---------------- sound/soc/codecs/wm_adsp.c | 8 +++++++- sound/soc/codecs/wm_adsp.h | 1 + 3 files changed, 25 insertions(+), 17 deletions(-) -- 2.30.2

2 6

[PATCH v1 0/2] Add HP G11 Quirks and update Dell Oasis Quirks
by Stefan Binding 09 Aug '23

09 Aug '23

Add quirks to support HP G11 using CS35l41 HDA, using both SPI and I2C. One older HP laptop has an SSID removed. In addition, all Dell Oasis laptops using CS35L41 have been switch to use SPI, with one SSID removed. Stefan Binding (2): ALSA: hda/realtek: Add quirks for HP G11 Laptops ALSA: hda/realtek: Switch Dell Oasis models to use SPI sound/pci/hda/patch_realtek.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -- 2.34.1

2 3

[PATCH] ASoC: codecs: aw88261: avoid uninitialized variable warning
by Arnd Bergmann 08 Aug '23

08 Aug '23

From: Arnd Bergmann <arnd(a)arndb.de> aw88261_reg_update() returns an unintialized error code in the success path: sound/soc/codecs/aw88261.c:651:7: error: variable 'ret' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (aw_dev->prof_cur != aw_dev->prof_index) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/codecs/aw88261.c:660:9: note: uninitialized use occurs here return ret; ^~~ sound/soc/codecs/aw88261.c:651:3: note: remove the 'if' if its condition is always true if (aw_dev->prof_cur != aw_dev->prof_index) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Return zero instead here. Fixes: 028a2ae256916 ("ASoC: codecs: Add aw88261 amplifier driver") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/codecs/aw88261.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c index 82923b454dd47..6e2266b713862 100644 --- a/sound/soc/codecs/aw88261.c +++ b/sound/soc/codecs/aw88261.c @@ -652,6 +652,8 @@ static int aw88261_reg_update(struct aw88261 *aw88261, bool force) ret = aw88261_dev_fw_update(aw88261); if (ret) return ret; + } else { + ret = 0; } } -- 2.39.2

3 2

[PATCH 01/12] ASoC: intel: sof_sdw: Printk's should end with a newline
by Charles Keepax 08 Aug '23

08 Aug '23

Add the missing new lines. Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/intel/boards/sof_sdw.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index fd27e211211bd..8f3329dcf7062 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -524,7 +524,7 @@ int sdw_prepare(struct snd_pcm_substream *substream) sdw_stream = snd_soc_dai_get_stream(dai, substream->stream); if (IS_ERR(sdw_stream)) { - dev_err(rtd->dev, "no stream found for DAI %s", dai->name); + dev_err(rtd->dev, "no stream found for DAI %s\n", dai->name); return PTR_ERR(sdw_stream); } @@ -543,7 +543,7 @@ int sdw_trigger(struct snd_pcm_substream *substream, int cmd) sdw_stream = snd_soc_dai_get_stream(dai, substream->stream); if (IS_ERR(sdw_stream)) { - dev_err(rtd->dev, "no stream found for DAI %s", dai->name); + dev_err(rtd->dev, "no stream found for DAI %s\n", dai->name); return PTR_ERR(sdw_stream); } @@ -565,7 +565,7 @@ int sdw_trigger(struct snd_pcm_substream *substream, int cmd) } if (ret) - dev_err(rtd->dev, "%s trigger %d failed: %d", __func__, cmd, ret); + dev_err(rtd->dev, "%s trigger %d failed: %d\n", __func__, cmd, ret); return ret; } @@ -630,7 +630,7 @@ int sdw_hw_free(struct snd_pcm_substream *substream) sdw_stream = snd_soc_dai_get_stream(dai, substream->stream); if (IS_ERR(sdw_stream)) { - dev_err(rtd->dev, "no stream found for DAI %s", dai->name); + dev_err(rtd->dev, "no stream found for DAI %s\n", dai->name); return PTR_ERR(sdw_stream); } @@ -1339,7 +1339,7 @@ static int get_slave_info(const struct snd_soc_acpi_link_adr *adr_link, return -EINVAL; if (index >= SDW_MAX_CPU_DAIS) { - dev_err(dev, " cpu_dai_id array overflows"); + dev_err(dev, "cpu_dai_id array overflows\n"); return -EINVAL; } @@ -1490,7 +1490,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, int *link_index, return -ENOMEM; if (cpu_dai_index >= sdw_cpu_dai_num) { - dev_err(dev, "invalid cpu dai index %d", + dev_err(dev, "invalid cpu dai index %d\n", cpu_dai_index); return -EINVAL; } @@ -1503,12 +1503,12 @@ static int create_sdw_dailink(struct snd_soc_card *card, int *link_index, * not be larger than sdw_be_num */ if (*link_index >= sdw_be_num) { - dev_err(dev, "invalid dai link index %d", *link_index); + dev_err(dev, "invalid dai link index %d\n", *link_index); return -EINVAL; } if (*cpu_id >= sdw_cpu_dai_num) { - dev_err(dev, " invalid cpu dai index %d", *cpu_id); + dev_err(dev, "invalid cpu dai index %d\n", *cpu_id); return -EINVAL; } @@ -1531,7 +1531,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, int *link_index, ret = set_codec_init_func(card, adr_link, dai_links + (*link_index)++, playback, group_id, adr_index, dai_index); if (ret < 0) { - dev_err(dev, "failed to init codec %d", codec_index); + dev_err(dev, "failed to init codec %d\n", codec_index); return ret; } @@ -1675,7 +1675,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) endpoint = adr_link->adr_d[i].endpoints; if (endpoint->aggregated && !endpoint->group_id) { - dev_err(dev, "invalid group id on link %x", + dev_err(dev, "invalid group id on link %x\n", adr_link->mask); continue; } @@ -1698,7 +1698,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) &be_id, &codec_conf_index, &ignore_pch_dmic, append_dai_type, i, j); if (ret < 0) { - dev_err(dev, "failed to create dai link %d", link_index); + dev_err(dev, "failed to create dai link %d\n", link_index); return ret; } } -- 2.30.2

2 12

[PATCH -next] ASoC: imx-audio-rpmsg: Remove redundant initialization owner in imx_audio_rpmsg_driver
by Li Zetao 08 Aug '23

08 Aug '23

The module_rpmsg_driver() will set "THIS_MODULE" to driver.owner when register a rpmsg_driver driver, so it is redundant initialization to set driver.owner in the statement. Remove it for clean code. Signed-off-by: Li Zetao <lizetao1(a)huawei.com> --- sound/soc/fsl/imx-audio-rpmsg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/fsl/imx-audio-rpmsg.c b/sound/soc/fsl/imx-audio-rpmsg.c index d5234ac4b09b..289e47c03d40 100644 --- a/sound/soc/fsl/imx-audio-rpmsg.c +++ b/sound/soc/fsl/imx-audio-rpmsg.c @@ -116,7 +116,6 @@ static struct rpmsg_device_id imx_audio_rpmsg_id_table[] = { static struct rpmsg_driver imx_audio_rpmsg_driver = { .drv.name = "imx_audio_rpmsg", - .drv.owner = THIS_MODULE, .id_table = imx_audio_rpmsg_id_table, .probe = imx_audio_rpmsg_probe, .callback = imx_audio_rpmsg_cb, -- 2.34.1

2 1

[linux-next:master] BUILD REGRESSION 71cd4fc492ec41e4acd85e98bbf7a13753fc1e03
by kernel test robot 08 Aug '23

08 Aug '23

tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master branch HEAD: 71cd4fc492ec41e4acd85e98bbf7a13753fc1e03 Add linux-next specific files for 20230808 Error/Warning reports: https://lore.kernel.org/oe-kbuild-all/202307251531.p8ZLFTMZ-lkp@intel.com https://lore.kernel.org/oe-kbuild-all/202308081459.US5rLYAY-lkp@intel.com Error/Warning: (recently discovered and may have been fixed) ../lib/gcc/loongarch64-linux/12.3.0/plugin/include/config/loongarch/loongarch-opts.h:31:10: fatal error: loongarch-def.h: No such file or directory drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_replay.c:37: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst sound/soc/codecs/aw88261.c:651:7: warning: variable 'ret' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] Unverified Error/Warning (likely false positive, please contact us if interested): drivers/gpu/drm/tests/drm_exec_test.c:166 test_prepare_array() error: uninitialized symbol 'ret'. drivers/mtd/nand/raw/qcom_nandc.c:2590 qcom_op_cmd_mapping() error: uninitialized symbol 'ret'. drivers/mtd/nand/raw/qcom_nandc.c:3017 qcom_check_op() warn: was && intended here instead of ||? kernel/futex/waitwake.c:422 futex_wait_multiple_setup() warn: bitwise AND condition is false here sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:927: Error: pcrel too far Error/Warning ids grouped by kconfigs: gcc_recent_errors |-- alpha-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arc-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arm-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arm-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arm64-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- csky-randconfig-m041-20230808 | `-- drivers-gpu-drm-tests-drm_exec_test.c-test_prepare_array()-error:uninitialized-symbol-ret-. |-- i386-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- loongarch-allmodconfig | `-- lib-gcc-loongarch64-linux-..-plugin-include-config-loongarch-loongarch-opts.h:fatal-error:loongarch-def.h:No-such-file-or-directory |-- mips-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- mips-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- parisc-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- powerpc-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- riscv-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- riscv-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- riscv-randconfig-m031-20230808 | |-- drivers-gpu-drm-tests-drm_exec_test.c-test_prepare_array()-error:uninitialized-symbol-ret-. | |-- drivers-mtd-nand-raw-qcom_nandc.c-qcom_check_op()-warn:was-intended-here-instead-of | |-- drivers-mtd-nand-raw-qcom_nandc.c-qcom_op_cmd_mapping()-error:uninitialized-symbol-ret-. | `-- kernel-futex-waitwake.c-futex_wait_multiple_setup()-warn:bitwise-AND-condition-is-false-here |-- s390-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- s390-randconfig-r044-20230808 | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- sh-allmodconfig | |-- sh4-linux-gcc:internal-compiler-error:Segmentation-fault-signal-terminated-program-cc1 | |-- standard-input:Error:pcrel-too-far | `-- standard-input:Warning:end-of-file-not-at-end-of-a-line-newline-inserted |-- sparc-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- x86_64-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst `-- xtensa-randconfig-r022-20230808 `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst clang_recent_errors `-- arm64-randconfig-r006-20230808 `-- sound-soc-codecs-aw88261.c:warning:variable-ret-is-used-uninitialized-whenever-if-condition-is-false elapsed time: 721m configs tested: 106 configs skipped: 5 tested configs: alpha allyesconfig gcc alpha defconfig gcc arc allyesconfig gcc arc defconfig gcc arc randconfig-r034-20230808 gcc arc randconfig-r043-20230808 gcc arm allmodconfig gcc arm allyesconfig gcc arm defconfig gcc arm randconfig-r012-20230808 clang arm randconfig-r046-20230808 clang arm64 allyesconfig gcc arm64 defconfig gcc arm64 randconfig-r001-20230808 clang csky defconfig gcc csky randconfig-r024-20230808 gcc hexagon randconfig-r015-20230808 clang hexagon randconfig-r031-20230808 clang hexagon randconfig-r041-20230808 clang hexagon randconfig-r045-20230808 clang i386 allyesconfig gcc i386 buildonly-randconfig-r004-20230808 clang i386 buildonly-randconfig-r005-20230808 clang i386 buildonly-randconfig-r006-20230808 clang i386 debian-10.3 gcc i386 defconfig gcc i386 randconfig-i001-20230808 clang i386 randconfig-i002-20230808 clang i386 randconfig-i003-20230808 clang i386 randconfig-i004-20230808 clang i386 randconfig-i005-20230808 clang i386 randconfig-i006-20230808 clang i386 randconfig-i011-20230808 gcc i386 randconfig-i012-20230808 gcc i386 randconfig-i013-20230808 gcc i386 randconfig-i014-20230808 gcc i386 randconfig-i015-20230808 gcc i386 randconfig-i016-20230808 gcc i386 randconfig-r014-20230808 gcc loongarch allmodconfig gcc loongarch allnoconfig gcc loongarch defconfig gcc m68k allmodconfig gcc m68k allyesconfig gcc m68k defconfig gcc m68k randconfig-r004-20230808 gcc mips allmodconfig gcc mips allyesconfig gcc nios2 defconfig gcc parisc allyesconfig gcc parisc defconfig gcc parisc randconfig-r002-20230808 gcc parisc randconfig-r016-20230808 gcc parisc64 defconfig gcc powerpc allmodconfig gcc powerpc allnoconfig gcc powerpc randconfig-r005-20230808 clang riscv allmodconfig gcc riscv allnoconfig gcc riscv allyesconfig gcc riscv defconfig gcc riscv randconfig-r042-20230808 gcc riscv rv32_defconfig gcc s390 allmodconfig gcc s390 allyesconfig gcc s390 defconfig gcc s390 randconfig-r011-20230808 gcc s390 randconfig-r023-20230808 gcc s390 randconfig-r044-20230808 gcc sh allmodconfig gcc sh randconfig-r006-20230808 gcc sh randconfig-r025-20230808 gcc sparc allyesconfig gcc sparc defconfig gcc um allmodconfig clang um allnoconfig clang um allyesconfig clang um defconfig gcc um i386_defconfig gcc um randconfig-r033-20230808 gcc um x86_64_defconfig gcc x86_64 allyesconfig gcc x86_64 buildonly-randconfig-r001-20230808 clang x86_64 buildonly-randconfig-r002-20230808 clang x86_64 buildonly-randconfig-r003-20230808 clang x86_64 defconfig gcc x86_64 kexec gcc x86_64 randconfig-r003-20230808 clang x86_64 randconfig-r021-20230808 gcc x86_64 randconfig-x001-20230808 gcc x86_64 randconfig-x002-20230808 gcc x86_64 randconfig-x003-20230808 gcc x86_64 randconfig-x004-20230808 gcc x86_64 randconfig-x005-20230808 gcc x86_64 randconfig-x006-20230808 gcc x86_64 randconfig-x011-20230808 clang x86_64 randconfig-x012-20230808 clang x86_64 randconfig-x013-20230808 clang x86_64 randconfig-x014-20230808 clang x86_64 randconfig-x015-20230808 clang x86_64 randconfig-x016-20230808 clang x86_64 rhel-8.3-rust clang x86_64 rhel-8.3 gcc xtensa randconfig-r013-20230808 gcc xtensa randconfig-r022-20230808 gcc xtensa randconfig-r035-20230808 gcc -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH] ASoC: amd: acp3x-rt5682-max9836: Configure jack as not detecting Line Out
by Alper Nebi Yasak 08 Aug '23

08 Aug '23

The RT5682, RT1015 and RT1015p codecs used in this driver do not seem capable of distinguishing Line Out connections from Headphone, but the driver configures its jack object as if it can. Remove the wrong value from the jack creation call to avoid any confusion. Signed-off-by: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> --- Depends on [1] which applies onto of linux-next. Untested, see [2]: [1] https://lore.kernel.org/alsa-devel/20230802175737.263412-5-alpernebiyasak@g… [2] https://lore.kernel.org/alsa-devel/3d6794c9-60d3-b8f3-99d2-afdc69593d9f@gma… sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 3bf7e1e83c36..28ad5f5b9a76 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -98,7 +98,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) rt5682_dai_bclk = clk_get(component->dev, "rt5682-dai-bclk"); ret = snd_soc_card_jack_new_pins(card, "Headset Jack", - SND_JACK_HEADSET | SND_JACK_LINEOUT | + SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, &pco_jack, base-commit: 626c67169f9972fffcdf3bc3864de421f162ebf5 prerequisite-patch-id: 7158530856f8f97324906b342528a5ffe7b4032b -- 2.40.1

4 3

[PATCH 00/20] ASoC: SOF: Intel: add LunarLake support
by Pierre-Louis Bossart 08 Aug '23

08 Aug '23

IMPORTANT NOTE: this patchset is dependent on Takashi's hda-intel-6.6 tag. The PCI parts will not compile without merging this tag into the ASoC tree. This patchset first fixes a number of errors made in the hda-mlink support, then adds Lunar Lake definitions. The main contribution is the hda-dai changes where the HDaudio DMA is now used for SSP, DMIC and SoundWire. In previous hardware the GPDMA (aka DesignWare) was used and controlled by the audio firmware. The volume of code is minimized with the abstraction added in previous kernel cycles. Due to cross-dependencies between ASoC and SoundWire trees, the full support for jack detection will be deferred to the next kernel cycle. There's not much point to ask for a sync of the two trees to support one patch for each tree - we are at -rc5 already. Pierre-Louis Bossart (18): ASoC: SOF: Intel: hda-mlink: fix off-by-one error ASoC: SOF: Intel: fix u16/32 confusion in LSDIID ASoC: SOF: ipc4-topology: restore gateway config length ASoC: SOF: Intel: hda: add interface definitions for ACE2.x ASoC: SOF: Intel: split MTL and LNL operations ASoC: SOF: Intel: LNL: enable DMIC/SSP offload in probe/resume ASoC: SOF: Intel: hda-dai-ops: add/select DMA ops for SSP ASoC: SOF: Intel: hda-dai: add ops for SSP ASoC: SOF: Intel: hda-dai: add DMIC support ASoC: SOF: Intel: hda-dai-ops: only allocate/release streams for first CPU DAI ASoC: SOF: Intel: hda-dai-ops: add ops for SoundWire ASoC: SOF: Intel: hda-dai: add helpers for SoundWire callbacks ASoC: SOF: Intel: hda: add hw_params/free/trigger callbacks ASoC: SOF: Intel: add abstraction for SoundWire wake-ups ASoC: SOF: Intel: hda-mlink: add helper to get sublink LSDIID register ASoC: SOF: Intel: hda-dai-ops: reset device count for SoundWire DAIs ASoC: SOF: IPC4: clarify 'pipeline_ids' usage and logs ASoC: SOF: Intel: hda-mlink: add sublink to dev_dbg() log Ranjani Sridharan (2): ASoC: SOF: ipc4: avoid uninitialized default instance 0 ASoC: SOF: Intel: LNL: Add support for Lunarlake platform include/sound/hda-mlink.h | 4 + sound/soc/sof/intel/Kconfig | 16 +++ sound/soc/sof/intel/Makefile | 4 +- sound/soc/sof/intel/cnl.c | 2 + sound/soc/sof/intel/hda-dai-ops.c | 179 ++++++++++++++++++++++++- sound/soc/sof/intel/hda-dai.c | 211 +++++++++++++++++++++++++++++- sound/soc/sof/intel/hda-mlink.c | 45 ++++++- sound/soc/sof/intel/hda.c | 58 +++++++- sound/soc/sof/intel/hda.h | 21 +++ sound/soc/sof/intel/icl.c | 1 + sound/soc/sof/intel/lnl.c | 189 ++++++++++++++++++++++++++ sound/soc/sof/intel/mtl.c | 23 ++-- sound/soc/sof/intel/mtl.h | 22 +++- sound/soc/sof/intel/pci-lnl.c | 71 ++++++++++ sound/soc/sof/intel/shim.h | 1 + sound/soc/sof/intel/tgl.c | 4 + sound/soc/sof/ipc4-pcm.c | 21 +-- sound/soc/sof/ipc4-topology.c | 7 + sound/soc/sof/ipc4-topology.h | 4 +- sound/soc/sof/topology.c | 2 + 20 files changed, 842 insertions(+), 43 deletions(-) create mode 100644 sound/soc/sof/intel/lnl.c create mode 100644 sound/soc/sof/intel/pci-lnl.c -- 2.39.2

2 23