APPLIED: [SRU][R][PATCH 0/3] ASoC: enable rt1320 speaker amp and DMIC on PTL SoundWire platforms

[Edoardo Canepa]

Applied to R:linux/master-next. Thanks.

On 4/27/26 08:19, Aaron Ma wrote:
> BugLink: https://bugs.launchpad.net/bugs/2150196
>
> SRU Justification:
>
> [ Impact ]
> Lenovo PTL systems with rt722 headset codec + rt1320 speaker amp over
> SoundWire have no speaker audio and no DMIC. The kernel's PTL match
> table lacks the rt722_l0_rt1320_l23 topology, the rt1320
> codec_info_list is missing its DMIC dai, and the is_amp flag is
> absent -- so the machine driver never matches and the wrong name
> prefix is assigned.
>
> [ Fix ]
> Three upstream commits from Linus's mainline tree for resolute,
> 1. 9033f7b7f27d -- drop rt722 monolithic match tables
> 2. dd4a1963ddf0 -- add is_amp flag to fix wrong name prefix
> 3. ae2cb3384337 -- add rt1320/rt1321 DMIC dai in codec_info_list
>
> All cherry-pick cleanly with zero conflicts. Diffs are byte-identical
> to upstream (only index hashes and hunk offsets differ due to different
> base tree).
>
> [ Test Plan ]
> On a Lenovo PTL system with spk:rt1320 + hs:rt722:
> 1. Boot without patches: no speaker sound card components, no DMIC
> 2. Boot with patches:
>     - Speaker playback: aplay -D hw:0,2 tone.wav
>     - DMIC loopback: play 1kHz tone through speaker, record from DMIC,
>       FFT confirms peak at 1000 Hz
>     - WirePlumber sees all devices
>     - Mute LEDs functional (speaker and mic)
>     - Suspend/resume: full status diff pre vs post identical, loopback
>       and LEDs work after resume
>
> [ Where problems could occur ]
> Patches touch PTL match tables, SoundWire codec_info_list, and SOF
> HDA codec matching. A wrong match table entry could cause a different
> PTL topology to break (wrong codec matched). The is_amp flag override
> in find_acpi_adr_device() runs for all SoundWire codecs on Intel SOF
> platforms -- if the flag logic is wrong, non-amp codecs could get
> misidentified, breaking name prefixes and DAI routing. Commits 4-5
> remove rt721/rt722 monolithic match tables; any PTL machine still
> relying on monolithic matching (rather than function topologies)
> would lose its match entry.
>
> [ Other Info ]
> Since the hardware is only fully supported from 6.17 kernel,
> SRU for resolute and oem-6.17 and resolute only.
>
> Derek Fang (2):
>    ASoC: SOF: Intel: Add a is_amp flag to fix the wrong name prefix
>    ASoC: sdw_utils: add rt1320 and rt1321 dmic dai in codec_info_list
>
> Mac Chiang (1):
>    ASoC: Intel: soc-acpi-intel-ptl-match: drop rt722 monolithic match
>      tables
>
>   include/sound/soc_sdw_utils.h                 |   2 +
>   .../intel/common/soc-acpi-intel-ptl-match.c   | 100 ------------------
>   sound/soc/sdw_utils/soc_sdw_rt_dmic.c         |  46 +++++++-
>   sound/soc/sdw_utils/soc_sdw_utils.c           |  26 ++++-
>   sound/soc/sof/intel/hda.c                     |  10 ++
>   5 files changed, 79 insertions(+), 105 deletions(-)
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0x20F88172E14F6784.asc
Type: application/pgp-keys
Size: 3167 bytes
Desc: OpenPGP public key
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20260508/a34cbd0a/attachment.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20260508/a34cbd0a/attachment.sig>