February 2022 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [RESEND v6 0/1] firmware: mtk: add adsp ipc protocol for sof
by Allen-KH Cheng 18 Mar '22

18 Mar '22

This patch provides mtk adsp ipc support for sof. ADSP IPC protocol offers (send/recv) interfaces using mediatek-mailbox APIs. This was tested and confirmed on MT8195 cherry board with sof. Based on linux-next changes since v5: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v4: - add error message for wrong mbox chan changes since v3: - rebase on v5.16-rc8 - update reviewers changes since v2: - add out tag for two memory free phases changes since v1: - add comments for mtk_adsp_ipc_send and mtk_adsp_ipc_recv - remove useless MODULE_LICENSE - change label name to out_free Allen-KH Cheng (1): firmware: mediatek: add adsp ipc protocol interface drivers/firmware/Kconfig | 1 + drivers/firmware/Makefile | 1 + drivers/firmware/mediatek/Kconfig | 9 + drivers/firmware/mediatek/Makefile | 2 + drivers/firmware/mediatek/mtk-adsp-ipc.c | 161 ++++++++++++++++++ .../linux/firmware/mediatek/mtk-adsp-ipc.h | 65 +++++++ 6 files changed, 239 insertions(+) create mode 100644 drivers/firmware/mediatek/Kconfig create mode 100644 drivers/firmware/mediatek/Makefile create mode 100644 drivers/firmware/mediatek/mtk-adsp-ipc.c create mode 100644 include/linux/firmware/mediatek/mtk-adsp-ipc.h -- 2.18.0

2 2

[Sound-open-firmware] [PATCH v18 0/2] mtk: add ADSP mailbox controller for MT8195
by Allen-KH Cheng 05 Mar '22

05 Mar '22

Mediatek ADSP IPC is used to send notification or short message between processors with dsp. It will place the message to the share buffer and will access the ADSP mailbox registers to kick dsp. Two mailboxes used to send notification or short message between processors with dsp. This patchset was tested and confirmed on MT8195 cherry board. Based on tag: next-20220223, linux-next/master changes since v17: - remove description and add maxItems for reg and interrupts in mtk,adsp-mbox.yaml changes since v16: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v15: - add paragraphs to describe the config symbols fully changes since v14: - add inline for get_mtk_adsp_mbox_priv changes since v13: - rebase on v5.16-rc8 - add back ptr check from of_device_get_match_data changes since v12: - remove of_device_get_match_data ptr check: of_device_get_match_data(dev) will never going to return NULL. driver probe with compatible mediatek,mt8195-adsp-mbox. changes since v11: - remove useless MODULE_LICENSE changes since v10: - split up v9 into two separate submissions changes since v9: - rename adsp_mbox_chan_ops to mtk_adsp_mbox_chan_ops changes since v8: - remove struct adsp_mbox_ch_info - add get_mtk_adsp_mbox_priv - use mtk_adsp_mbox_priv va_mboxreg address in adsp mbox driver - add struct mtk_adsp_mbox_cfg for DSP mbox register offset - remove adsp mbox register offset hard code define - remove mtk-adsp-ipc.h reference in adsp mbox driver changes since v7: - add mtk prefix for adsp ipc functions - rename adsp_mbox_ch_info to mtk_adsp_mbox_ch_info - remove incorrect reviewers in commit message changes since v6: - dt-bindings: change example dtsi node. - rename config MTK_ADSP_IPC_MBOX to MTK_ADSP_MBOX - remove unused variable - add reviewers changes since v5: - remove some redundant code changes since v4: - use switch ... case in adsp_ipc_recv - add error handling path for chan_name pointer - refine some code to be concise changes since v3: - reorder MTK_ADSP_IPC_MBOX config - remove some redundant code - remove lock in mtk-adsp-mailbox changes since v2: - separate adsp_mailbox into two instances changes since v1: - fix dt_binding_check error Allen-KH Cheng (2): dt-bindings: mailbox: mtk,adsp-mbox: add mtk adsp-mbox document mailbox: mediatek: add support for adsp mailbox controller .../bindings/mailbox/mtk,adsp-mbox.yaml | 50 +++++ drivers/mailbox/Kconfig | 9 + drivers/mailbox/Makefile | 2 + drivers/mailbox/mtk-adsp-mailbox.c | 176 ++++++++++++++++++ 4 files changed, 237 insertions(+) create mode 100644 Documentation/devicetree/bindings/mailbox/mtk,adsp-mbox.yaml create mode 100644 drivers/mailbox/mtk-adsp-mailbox.c -- 2.18.0

2 3

[Sound-open-firmware] [RESEND v17 0/2] mtk: add ADSP mailbox controller for MT8195
by Allen-KH Cheng 25 Feb '22

25 Feb '22

Mediatek ADSP IPC is used to send notification or short message between processors with dsp. It will place the message to the share buffer and will access the ADSP mailbox registers to kick dsp. Two mailboxes used to send notification or short message between processors with dsp. This patchset was tested and confirmed on MT8195 cherry board. Based on tag: next-20220223, linux-next/master changes since v16: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v15: - add paragraphs to describe the config symbols fully changes since v14: - add inline for get_mtk_adsp_mbox_priv changes since v13: - rebase on v5.16-rc8 - add back ptr check from of_device_get_match_data changes since v12: - remove of_device_get_match_data ptr check: of_device_get_match_data(dev) will never going to return NULL. driver probe with compatible mediatek,mt8195-adsp-mbox. changes since v11: - remove useless MODULE_LICENSE changes since v10: - split up v9 into two separate submissions changes since v9: - rename adsp_mbox_chan_ops to mtk_adsp_mbox_chan_ops changes since v8: - remove struct adsp_mbox_ch_info - add get_mtk_adsp_mbox_priv - use mtk_adsp_mbox_priv va_mboxreg address in adsp mbox driver - add struct mtk_adsp_mbox_cfg for DSP mbox register offset - remove adsp mbox register offset hard code define - remove mtk-adsp-ipc.h reference in adsp mbox driver changes since v7: - add mtk prefix for adsp ipc functions - rename adsp_mbox_ch_info to mtk_adsp_mbox_ch_info - remove incorrect reviewers in commit message changes since v6: - dt-bindings: change example dtsi node. - rename config MTK_ADSP_IPC_MBOX to MTK_ADSP_MBOX - remove unused variable - add reviewers changes since v5: - remove some redundant code changes since v4: - use switch ... case in adsp_ipc_recv - add error handling path for chan_name pointer - refine some code to be concise changes since v3: - reorder MTK_ADSP_IPC_MBOX config - remove some redundant code - remove lock in mtk-adsp-mailbox changes since v2: - separate adsp_mailbox into two instances changes since v1: - fix dt_binding_check error Allen-KH Cheng (2): dt-bindings: mailbox: mtk,adsp-mbox: add mtk adsp-mbox document mailbox: mediatek: add support for adsp mailbox controller .../bindings/mailbox/mtk,adsp-mbox.yaml | 52 ++++++ drivers/mailbox/Kconfig | 9 + drivers/mailbox/Makefile | 2 + drivers/mailbox/mtk-adsp-mailbox.c | 176 ++++++++++++++++++ 4 files changed, 239 insertions(+) create mode 100644 Documentation/devicetree/bindings/mailbox/mtk,adsp-mbox.yaml create mode 100644 drivers/mailbox/mtk-adsp-mailbox.c -- 2.18.0

3 4

Re: [Sound-open-firmware] [PATCH v4] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
by Mark Brown 24 Feb '22

24 Feb '22

On Fri, 25 Feb 2022 01:58:36 +0700, Ammar Faizi wrote: > Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns > -ENOMEM because it leads to a NULL pointer dereference bug. > > The dmesg says: > > [ T1387] sof-audio-pci-intel-tgl 0000:00:1f.3: error: memory alloc failed: -12 > [ T1387] BUG: kernel NULL pointer dereference, address: 0000000000000000 > [ T1387] #PF: supervisor read access in kernel mode > [ T1387] #PF: error_code(0x0000) - not-present page > [ T1387] PGD 0 P4D 0 > [ T1387] Oops: 0000 [#1] PREEMPT SMP NOPTI > [ T1387] CPU: 6 PID: 1387 Comm: alsa-sink-HDA A Tainted: G W 5.17.0-rc4-superb-owl-00055-g80d47f5de5e3 > [ T1387] Hardware name: HP HP Laptop 14s-dq2xxx/87FD, BIOS F.15 09/15/2021 > [ T1387] RIP: 0010:dma_free_noncontiguous+0x37/0x80 > [ T1387] Code: [... snip ...] > [ T1387] RSP: 0000:ffffc90002b87770 EFLAGS: 00010246 > [ T1387] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 > [ T1387] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888101db30d0 > [ T1387] RBP: 00000000fffffff4 R08: 0000000000000000 R09: 0000000000000000 > [ T1387] R10: 0000000000000000 R11: ffffc90002b874d0 R12: 0000000000000001 > [ T1387] R13: 0000000000058000 R14: ffff888105260c68 R15: ffff888105260828 > [ T1387] FS: 00007f42e2ffd640(0000) GS:ffff888466b80000(0000) knlGS:0000000000000000 > [ T1387] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ T1387] CR2: 0000000000000000 CR3: 000000014acf0003 CR4: 0000000000770ee0 > [ T1387] PKRU: 55555554 > [ T1387] Call Trace: > [ T1387] <TASK> > [ T1387] cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] > [... snip ...] > [ T1387] </TASK> > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM commit: b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [Sound-open-firmware] [PATCH v3] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
by Mark Brown 24 Feb '22

24 Feb '22

On Fri, 25 Feb 2022 01:28:18 +0700, Ammar Faizi wrote: > From: Ammar Faizi <ammarfaizi2(a)gnuweeb.org> > > Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns > -ENOMEM because it leads to a NULL pointer dereference bug. > > The dmesg says: > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM commit: b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [Sound-open-firmware] [PATCH v2] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
by Mark Brown 24 Feb '22

24 Feb '22

On Fri, 25 Feb 2022 01:08:50 +0700, Ammar Faizi wrote: > Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns > -ENOMEM because it leads to a NULL pointer dereference bug. > > The dmesg says: > > [ T1387] sof-audio-pci-intel-tgl 0000:00:1f.3: error: memory alloc failed: -12 > [ T1387] BUG: kernel NULL pointer dereference, address: 0000000000000000 > [ T1387] #PF: supervisor read access in kernel mode > [ T1387] #PF: error_code(0x0000) - not-present page > [ T1387] PGD 0 P4D 0 > [ T1387] Oops: 0000 [#1] PREEMPT SMP NOPTI > [ T1387] CPU: 6 PID: 1387 Comm: alsa-sink-HDA A Tainted: G W 5.17.0-rc4-superb-owl-00055-g80d47f5de5e3 #3 56590caeed02394520e20ca5a2059907eb2d5079 > [ T1387] Hardware name: HP HP Laptop 14s-dq2xxx/87FD, BIOS F.15 09/15/2021 > [ T1387] RIP: 0010:dma_free_noncontiguous+0x37/0x80 > [ T1387] Code: 8b 87 80 03 00 00 48 85 c0 75 07 48 8b 05 f9 39 2b 02 48 85 c0 74 13 4c 8b 48 28 4d 85 c9 74 0a 48 89 da 44 89 c1 5b 41 ff e1 <48> 8b 0b 48 8b 11 48 8b 49 10 48 83 e2 fc 48 81 c6 ff 0f 00 00 48 > [ T1387] RSP: 0000:ffffc90002b87770 EFLAGS: 00010246 > [ T1387] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 > [ T1387] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888101db30d0 > [ T1387] RBP: 00000000fffffff4 R08: 0000000000000000 R09: 0000000000000000 > [ T1387] R10: 0000000000000000 R11: ffffc90002b874d0 R12: 0000000000000001 > [ T1387] R13: 0000000000058000 R14: ffff888105260c68 R15: ffff888105260828 > [ T1387] FS: 00007f42e2ffd640(0000) GS:ffff888466b80000(0000) knlGS:0000000000000000 > [ T1387] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ T1387] CR2: 0000000000000000 CR3: 000000014acf0003 CR4: 0000000000770ee0 > [ T1387] PKRU: 55555554 > [ T1387] Call Trace: > [ T1387] <TASK> > [ T1387] cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] > [ T1387] hda_dsp_cl_boot_firmware_iccmax+0x50/0xf0 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] > [ T1387] snd_sof_run_firmware+0xb5/0x300 [snd_sof b83a5eaf64712c6f474ef3641062bb71902deae4] > [ T1387] sof_resume+0xb1/0x2c0 [snd_sof b83a5eaf64712c6f474ef3641062bb71902deae4] > [ T1387] ? pci_pme_active+0x1b4/0x220 > [ T1387] pci_pm_runtime_resume+0xaa/0xe0 > [ T1387] ? pci_pm_runtime_suspend+0x190/0x190 > [ T1387] __rpm_callback+0x9c/0x320 > [ T1387] ? pci_pm_runtime_suspend+0x190/0x190 > [ T1387] ? pci_pm_runtime_suspend+0x190/0x190 > [ T1387] rpm_resume+0x50d/0x690 > [ T1387] __pm_runtime_resume+0x69/0x80 > [ T1387] snd_soc_pcm_component_pm_runtime_get+0x60/0xe0 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] > [ T1387] __soc_pcm_open+0x82/0x530 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] > [ T1387] dpcm_be_dai_startup+0x14b/0x260 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] > [ T1387] dpcm_fe_dai_startup+0x73/0x930 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] > [ T1387] ? dpcm_add_paths+0x109/0x1b0 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] > [ T1387] dpcm_fe_dai_open+0x74/0x160 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] > [ T1387] snd_pcm_open_substream+0x56f/0x840 [snd_pcm 2213f8e36532d8bc92ec1ec574108b0385b1b13a] > [ T1387] snd_pcm_open+0xb3/0x1d0 [snd_pcm 2213f8e36532d8bc92ec1ec574108b0385b1b13a] > [ T1387] ? sched_dynamic_update+0x1a0/0x1a0 > [ T1387] ? cd_forget+0x80/0x80 > [ T1387] snd_pcm_playback_open+0x3c/0x60 [snd_pcm 2213f8e36532d8bc92ec1ec574108b0385b1b13a] > [ T1387] chrdev_open+0x1d3/0x200 > [ T1387] ? cd_forget+0x80/0x80 > [ T1387] do_dentry_open+0x254/0x370 > [ T1387] path_openat+0x9e6/0xbc0 > [ T1387] ? lock_release+0x230/0x300 > [ T1387] ? snd_ctl_ioctl+0x759/0x900 [snd 1eb0a4959d3d3710c16836cd2838d885bf8f75a9] > [ T1387] do_filp_open+0x93/0x120 > [ T1387] ? alloc_fd+0x147/0x180 > [ T1387] ? _raw_spin_unlock+0x29/0x40 > [ T1387] ? alloc_fd+0x147/0x180 > [ T1387] do_sys_openat2+0x68/0x130 > [ T1387] __x64_sys_openat+0x6f/0x80 > [ T1387] do_syscall_64+0x3d/0xb0 > [ T1387] ? exit_to_user_mode_prepare+0x2c/0x50 > [ T1387] entry_SYSCALL_64_after_hwframe+0x44/0xae > [ T1387] RIP: 0033:0x7f42ee19a6e4 > [ T1387] Code: 24 20 eb 8f 66 90 44 89 54 24 0c e8 16 d2 f7 ff 44 8b 54 24 0c 44 89 e2 48 89 ee 41 89 c0 bf 9c ff ff ff b8 01 01 00 00 0f 05 <48> 3d 00 f0 ff ff 77 34 44 89 c7 89 44 24 0c e8 58 d2 f7 ff 8b 44 > [ T1387] RSP: 002b:00007f42e2ffc620 EFLAGS: 00000293 ORIG_RAX: 0000000000000101 > [ T1387] RAX: ffffffffffffffda RBX: 0000000000080802 RCX: 00007f42ee19a6e4 > [ T1387] RDX: 0000000000080802 RSI: 00007f42e2ffc6c0 RDI: 00000000ffffff9c > [ T1387] RBP: 00007f42e2ffc6c0 R08: 0000000000000000 R09: 00007f42e2ffc437 > [ T1387] R10: 0000000000000000 R11: 0000000000000293 R12: 0000000000080802 > [ T1387] R13: 00007f42e8c3faa0 R14: 00007f42e2ffc6c0 R15: 0000000081204101 > [ T1387] </TASK> > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM commit: b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [Sound-open-firmware] [PATCH] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
by Pierre-Louis Bossart 24 Feb '22

24 Feb '22

>> From: Ammar Faizi <ammarfaizi2(a)gnuweeb.org> >> >> Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns >> -ENOMEM because it leads to a NULL pointer dereference bug. > > Reviewed-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Thanks for this patch. looks good and tested by our CI, so Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>

1 0

[Sound-open-firmware] New, separate sof-tplg-v1.2.3.tar.gz tarball release for topologies
by Herbert, Marc 23 Feb '22

23 Feb '22

Hi, Topologies tend to require more frequent releases, so we plan to split future sof binary releases into two different tarballs instead of one. From: sof-bin-v1.2.3.tar.gz # firmare _and_ topologies in the same tarball To: sof-bin-v1.2.4.tar.gz # firmware sof-tplg-v1.2.4.tar.gz # topologies Every firmware tarball will have a corresponding topologies tarball. Some topologies releases will have NO corresponding firmware tarball. At this point in time there is no plan to change the structure of the sof-bin git repo, this change will affect tarballs only. Thoughts, comments? Thanks! Marc https://github.com/thesofproject/sof-bin/releases

4 5

[Sound-open-firmware] [PATCH v2] ASoC: SOF: Intel: Add topology overwrite for Felwinter
by Brent Lu 21 Feb '22

21 Feb '22

From: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> The Felwinter uses four max98360a amplifiers on corresponding CH0~CH3. There are four amps on the board connecting to headphone to SSP0 port, amp to SSP1,and the DAI format would be DSP_A,8-slots, 32 bit slot-width. CH0: L(Woofer), CH1:R(Woofer), CH2:L(Tweeter), CH3:R(Tweeter) Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> Signed-off-by: Brent Lu <brent.lu(a)intel.com> Reviewed-by: Curtis Malainey <cujomalainey(a)chromium.org> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/sof-pci-dev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 20c6ca37dbc4..61f2afd54c3e 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -67,6 +67,14 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", }, + { + .callback = sof_tplg_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO_AMP-MAX98360_ALC5682VS_I2S_2WAY"), + }, + .driver_data = "sof-adl-max98360a-rt5682-2way.tplg", + }, {} }; -- 2.25.1

2 1

[Sound-open-firmware] [PATCH] ASoC: SOF: Intel: Add topology overwrite for Felwinter
by Brent Lu 21 Feb '22

21 Feb '22

From: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> The Felwinter uses four max98360a amplifiers on corresponding CH0~CH3. There are four amps on the board connecting to headphone to SSP0 port, amp to SSP1,and the DAI format would be DSP_A,8-slots, 32 bit slot-width. CH0: L(Woofer), CH1:R(Woofer), CH2:L(Tweeter), CH3:R(Tweeter) Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> Signed-off-by: Brent Lu <brent.lu(a)intel.com> --- sound/soc/sof/sof-pci-dev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 20c6ca37dbc4..61f2afd54c3e 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -67,6 +67,14 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", }, + { + .callback = sof_tplg_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO_AMP-MAX98360_ALC5682VS_I2S_2WAY"), + }, + .driver_data = "sof-adl-max98360a-rt5682-2way.tplg", + }, {} }; -- 2.25.1

4 4