-
Notifications
You must be signed in to change notification settings - Fork 313
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.
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
[stable-v2.2] Missing topologies commits from jsl 005 #9492
[stable-v2.2] Missing topologies commits from jsl 005 #9492
Conversation
a7d858c
to
5e561b4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excellent, thank you @brentlu !
This reverts commit b365447. Signed-off-by: Brent Lu <brent.lu@intel.com>
Add support for cs42l42 with max98360a running on JSL boards. The cs42l42 needs to enable bclk earlier in prepare stage and disable bclk at hw_free statge so we add the SSP_CC_BCLK_ES flag for it. Signed-off-by: Brent Lu <brent.lu@intel.com> (cherry picked from commit 80a7795)
Add a new topology sof-jsl-rt5650 for ALC5650 which supports SSP0 for headset and SSP1 for speakers since this codec implements two I2S interfaces. DAI format changed to mclk: 24.576MHz, bclk: 3.072MHz, sample bits: 24-bit to avoid using ASRC function on codec side. Signed-off-by: Brent Lu <brent.lu@intel.com> (cherry picked from commit 6dc3504)
@lgirdwood I am not able to say, for stable-v2.2 we will not run our CI tests |
You do actually try to test stable-2.2 - and it keeps failing. That's why @lgirdwood asked. You shouldn't, problem filed in internal issue PTS-45980, filed in June 2023 https://sof-ci.01.org/sof-pr-viewer/#/build/PR9492/build14233836 Internal number build/14233836 |
Which branch are we supposed to be targetting, v2.2 or cavs-001-drop-stable? |
stable-v2.2 is used for https://github.com/thesofproject/sof-bin and regularly tested by Jenkins CI (especially for Linux kernel changes) I believe the "*-drop-stable" branches are used by Chromebooks. None of these branches is compatible with @wszypelt's "Internal Intel CI" (= pure firmware test suite, no OS). Only the main SOF branch is. EDIT: just realized #9471 has (much) more context |
After topology1 was removed from main branch, some topology changes to JSL boards only commits to jsl-005-drop-stable. In this PR we cherry-pick those commits to stable-v2.2 branch.
This PR impacts following topology files:
=> new topology
=> ALC5682's SOF_TKN_INTEL_SSP_CLKS_CONTROL token value changes from SSP_CC_BCLK_ES to SSP_CC_MCLK_AON since BCLK_ES flag is for CS42L42 and MCLK_AON is for ALC5682.