Skip to content

topology2: cavs-sdw: Add cs42l43 and cs35l56 support on ADL/RPL, MTL/ARL, LNL #9355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
kv2019i merged 2 commits into from
Sep 9, 2024
Merged

topology2: cavs-sdw: Add cs42l43 and cs35l56 support on ADL/RPL, MTL/ARL, LNL #9355

kv2019i merged 2 commits into from
Sep 9, 2024

Conversation

@macchian
Copy link
Contributor

@macchian macchian commented Aug 9, 2024 •
edited
Loading

SoundWire#
├── link 0: cs42l43 Audio Jack and DMICs/Bridge to amplifiers.
| | -> sof-rpl-cs42l43-l0.tplg
│ │ -> sof-mtl-cs42l43-l0.tplg
│ │ -> sof-arl-cs42l43-l0.tplg
│ │ -> sof-lnl-cs42l43-l0.tplg
│ │
│ ├── link 2: cs35l56 Left and Right Amplifier.
│ -> sof-arl-cs42l43-l0-cs35l56-l2.tplg
│
├──── link 2: cs35l56 Right/Rightx2 Amplifier.
├──── link 3: cs35l56 Left/Leftx2 Amplifier.
-> sof-adl-cs42l43-l0-cs35l56-l23.tplg
-> sof-arl-cs42l43-l0-cs35l56-l23.tplg
-> sof-lnl-cs42l43-l0-cs35l56-l23.tplg

SoundWire#
├── link 2: cs42l43 Audio Jack and DMICs.
│ -> sof-arl-cs42l43-l2.tplg
│
├──── link 3: cs35l56 Left and Right Amplifier.
-> sof-arl-cs42l43-l2-cs35l56-l3.tplg

@macchian macchian requested review from bardliao and plbossart August 9, 2024 03:14
@plbossart plbossart mentioned this pull request Aug 9, 2024
Merged
@macchian
Copy link
Contributor Author

macchian commented Aug 13, 2024

@charleskeepax , @bardliao , @plbossart , As you discused in thesofproject/linux#5130 (comment) , it's better to add all corresponding topologies support mapping to acpi mach entries. I will update the patch.

@macchian
topology2: update flags for alignment
0a0cd82 
PLATFORM=tgl, can safely removed as it is not included in cavs-sdw and
does not affect the soundwire configurations.

Remove SDW_FMT_24 flag because it has become the fixed format for
soundwire configurations.

SDW_AMP_FEEDBACK is currently used for debugging purposes. So set false
to disable it.

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
@macchian macchian force-pushed the dev-arl-codec branch 2 times, most recently from 65304dd to 1ef3efc Compare August 16, 2024 06:52
@macchian macchian changed the title topology2: cavs-sdw: Add cs42l43 and cs35l56 support on ARL topology2: cavs-sdw: Add cs42l43 and cs35l56 support on ADL, ARL, LNL Aug 16, 2024
charleskeepax
charleskeepax reviewed Aug 16, 2024
View reviewed changes
tools/topology/topology2/production/tplg-targets-cavs25.cmake
SDW_JACK_IN_STREAM=Capture-SimpleJack,SDW_AMP_FMT_24=true,SDW_JACK_FMT_24=true"
"cavs-sdw\;sof-tgl-cs42l43-l3-cs35l56-l01\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
Copy link
Contributor

@charleskeepax charleskeepax Aug 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we dropping the 24bit stuff here? I think we should probably add that on the other entries too, cs42l43 doesn't support 32-bits over the soundwire (not tried it, perhaps the extra bits just get ignored, but officially the hardware doesn't support) and also you will run out of soundwire bandwidth in a lot of configurations if sending 32-bit.

Copy link
Collaborator

@bardliao bardliao Aug 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we dropping the 24bit stuff here? I think we should probably add that on the other entries too, cs42l43 doesn't support 32-bits over the soundwire (not tried it, perhaps the extra bits just get ignored, but officially the hardware doesn't support) and also you will run out of soundwire bandwidth in a lot of configurations if sending 32-bit.

After #9282 was merged, 24 bit is the default format for SoundWire. We don't need to set SDW_AMP_FMT_24 and SDW_JACK_FMT_24 anymore.

Copy link
Contributor

@charleskeepax charleskeepax Aug 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah I see missed that, thanks, in that case all looks good for me the other comment is so minor I wouldn't both to do a spin just for it.

charleskeepax
charleskeepax reviewed Aug 16, 2024
View reviewed changes
tools/topology/topology2/production/tplg-targets-ace2.cmake Outdated
NUM_SDW_AMP_LINKS=2,SDW_DMIC_STREAM=SDW0-Capture"

# SDW Bridge to SPK
"cavs-sdw\;sof-lnl-cs42l43-l0\;PLATFORM=lnl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,\
Copy link
Contributor

@charleskeepax charleskeepax Aug 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nit but its a bit weird SDW_DMIC and NUM_SDW_AMP_LINKS is in a different order on this entry.

@lgirdwood
Copy link
Member

lgirdwood commented Aug 16, 2024

@charleskeepax , @bardliao , @plbossart , As you discused in thesofproject/linux#5130 (comment) , it's better to add all corresponding topologies support mapping to acpi mach entries. I will update the patch.

@macchian are we still pending on any items ? This looks ready to be non draft ?

@macchian
Copy link
Contributor Author

macchian commented Aug 21, 2024

@charleskeepax , @bardliao , @plbossart , As you discused in thesofproject/linux#5130 (comment) , it's better to add all corresponding topologies support mapping to acpi mach entries. I will update the patch.

@macchian are we still pending on any items ? This looks ready to be non draft ?

@lgirdwood, we are currently awaiting the codec verification results from the customer. I will provide an update as soon as the feedback is received.

@bardliao bardliao mentioned this pull request Sep 5, 2024
Closed
@macchian
topology2: Add cs42l43 and cs35l56 support on ADL/RPL, MTL/ARL, LNL
e140832 
The ADL, ARL, LNL hardware board configurations are below:
ARL has the same dsp generiation as MTL. So set platform = mtl.

SoundWire#
  ├── link 0: cs42l43 Audio Jack and DMICs/Bridge to amplifiers.
      | |     -> sof-rpl-cs42l43-l0.tplg
      │ │     -> sof-mtl-cs42l43-l0.tplg
      │ │     -> sof-arl-cs42l43-l0.tplg
      │ │     -> sof-lnl-cs42l43-l0.tplg
      │ │
      │ ├── link 2: cs35l56 Left and Right Amplifier.
      │	            -> sof-arl-cs42l43-l0-cs35l56-l2.tplg
      │
      ├──── link 2: cs35l56 Right/Rightx2 Amplifier.
      ├──── link 3: cs35l56 Left/Leftx2 Amplifier.
                    -> sof-adl-cs42l43-l0-cs35l56-l23.tplg
                    -> sof-arl-cs42l43-l0-cs35l56-l23.tplg
                    -> sof-lnl-cs42l43-l0-cs35l56-l23.tplg

SoundWire#
  ├── link 2: cs42l43 Audio Jack and DMICs.
      │       -> sof-arl-cs42l43-l2.tplg
      │ 
      ├──── link 3: cs35l56 Left and Right Amplifier.
                    -> sof-arl-cs42l43-l2-cs35l56-l3.tplg

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
@macchian macchian changed the title topology2: cavs-sdw: Add cs42l43 and cs35l56 support on ADL, ARL, LNL topology2: cavs-sdw: Add cs42l43 and cs35l56 support on ADL/RPL, MTL/ARL, LNL Sep 6, 2024
@macchian macchian marked this pull request as ready for review September 9, 2024 02:33
@kv2019i kv2019i merged commit 7fc758b into main Sep 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bardliao bardliao bardliao approved these changes

@mstrozek mstrozek mstrozek left review comments

@kv2019i kv2019i kv2019i approved these changes

@plbossart plbossart Awaiting requested review from plbossart

@lgirdwood lgirdwood Awaiting requested review from lgirdwood

@charleskeepax charleskeepax Awaiting requested review from charleskeepax

@ranj063 ranj063 Awaiting requested review from ranj063 ranj063 is a code owner

@jsarha jsarha Awaiting requested review from jsarha jsarha is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@macchian @lgirdwood @charleskeepax @bardliao @kv2019i @mstrozek