Skip to content
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

topology2: cavs-cs42l43: Add topology for cs42l43/cs35l56 on MTL #8773

Merged
merged 1 commit into from
Jan 25, 2024

Conversation

mstrozek
Copy link
Contributor

The layout is configured as:
- Link0: CS42L43 Jack and mics
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)

@mstrozek mstrozek added topology Topology issues MTL Applies to Meteor Lake platform labels Jan 23, 2024
@mstrozek mstrozek requested a review from stuhenderson January 23, 2024 11:34
@mstrozek
Copy link
Contributor Author

Corresponding mtl-match.c file change: https://lore.kernel.org/lkml/[email protected]/T/#u

@@ -32,6 +32,12 @@ NUM_HDMIS=0,SDW_SPK_STREAM=Playback-SmartAmp,SDW_SPK_IN_STREAM=Capture-SmartAmp,
SDW_DMIC_STREAM=Capture-SmartMic,SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
SDW_JACK_IN_STREAM=Capture-SimpleJack,SDW_AMP_FMT_24=true,SDW_JACK_FMT_24=true"

"cavs-sdw\;sof-mtl-cs42l43-l0-cs35l56-l23\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\
NUM_HDMIS=0,SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,\
Copy link
Member

Choose a reason for hiding this comment

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

please remove NUM_HDMIS=0, this is no longer needed.

Copy link
Member

Choose a reason for hiding this comment

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

we also need to fix line 31 @bardliao, NUM_HDMI=0 is a leftover we need to clean-up

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

@plbossart plbossart left a comment

Choose a reason for hiding this comment

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

change id nit pick, sound good otherwise.

@rfvirgil
Copy link
Contributor

rfvirgil commented Jan 24, 2024

The CS35L56 has feedback but it is currently only used for debug. As it isn't currently needed in production it seems safer to leave it off for now. We could turn it on in future.

There is no need to remove the feedback from sof-mtl-cs42l43-l0-cs35l56-l12. That is for the EIGHT-C/AIC board, right? Which is a development system so debugging is useful.

The layout is configured as:
    - Link0: CS42L43 Jack and mics
    - Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
    - Link3: 2x CS35L56 Speaker (amps 1 and 2, left)

Signed-off-by: Maciej Strozek <[email protected]>
@kv2019i kv2019i merged commit eea7b51 into main Jan 25, 2024
57 of 64 checks passed
@mstrozek mstrozek deleted the mstrozek/mtl branch January 26, 2024 08:25
roxell pushed a commit to roxell/linux that referenced this pull request Jan 31, 2024
The layout is configured as:
- Link0: CS42L43 Jack and mics (2ch)
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)

Corresponding SOF topology:
thesofproject/sof#8773

Signed-off-by: Maciej Strozek <[email protected]>
Link: https://msgid.link/r/[email protected]
Reviewed-by: Charles Keepax <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
fadlyas07 pushed a commit to greenforce-project/chromeos-kernel-mirror that referenced this pull request Aug 24, 2024
The layout is configured as:
- Link0: CS42L43 Jack and mics (2ch)
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)

Corresponding SOF topology:
thesofproject/sof#8773

Signed-off-by: Maciej Strozek <[email protected]>
Link: https://msgid.link/r/[email protected]
Reviewed-by: Charles Keepax <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 84b22af29ff6c74e09e3faa0ad52c843cca1f426)

BUG=b:326869955
TEST=Test Audio use cases.

Change-Id: Iffb31c988be4ef4f3e302d5f9d8780b57658223b
Signed-off-by: Debi sahoo <[email protected]>
hubot pushed a commit to aosp-mirror/kernel_common that referenced this pull request Oct 1, 2024
The layout is configured as:
- Link0: CS42L43 Jack and mics (2ch)
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)

Corresponding SOF topology:
thesofproject/sof#8773

Signed-off-by: Maciej Strozek <[email protected]>
Link: https://msgid.link/r/[email protected]
Reviewed-by: Charles Keepax <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 84b22af)

BUG=b:326869955
TEST=Test Audio use cases.

Change-Id: Iffb31c988be4ef4f3e302d5f9d8780b57658223b
Signed-off-by: Debi sahoo <[email protected]>
Signed-off-by: Hubert Mazur <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
MTL Applies to Meteor Lake platform topology Topology issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants