Skip to content

tplg: add tplg file for CML with da7219 + max98357 - #1545

Closed
macchian wants to merge 3 commits into
masterfrom
macchian-patch-2
Closed

macchian wants to merge 3 commits into
masterfrom
macchian-patch-2

Conversation

@macchian

@macchian macchian commented Jun 11, 2019 •

Copy link
Copy Markdown
Contributor

add the topology file for Cometlake
with analog codec da7219 on SSP0 for headphone playback/headset mic
with digital codec max98357 on SSP1 for speaker playback

Signed-off-by: Mac Chiang mac.chiang@intel.com

add the topology file for Cometlake
with analog codec da7219 on SSP0 for headphone playback/headset mic
with digital codec max98357 on SSP1 for speaker playback
upload wrong file
@jajanusz
jajanusz requested review from jajanusz and tlauda and removed request for jajanusz June 11, 2019 09:23

@tlauda tlauda left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Waiting for the final code.

@macchian

Copy link
Copy Markdown
Contributor Author

CMakeLists.txt

Comment thread tools/topology/CMakeLists.txt Outdated

@jajanusz jajanusz left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@macchian You requested merge to branch that is release branch. Release branch is meant to be frozen, unless you have very good reason to add something there. May I ask you why you want to do it?

@jajanusz

Copy link
Copy Markdown
Contributor

@macchian Also you are missing Signed-off-by line. We require this for contributions.

@macchian

Copy link
Copy Markdown
Contributor Author

@macchian You requested merge to branch that is release branch. Release branch is meant to be frozen, unless you have very good reason to add something there. May I ask you why you want to do it?

I'm not aware of the condition on release branch. Could you recommend the branch I should pull request? the master branch is ok?

@jajanusz

Copy link
Copy Markdown
Contributor

@macchian You can add new topologies with pull request to master branch.

@ranj063

ranj063 commented Jun 12, 2019

Copy link
Copy Markdown
Collaborator

@macchian is there a need for a new m4 file. Can we reuse sof-glk-da7219.m4 if the codec combination is the same?

@macchian

Copy link
Copy Markdown
Contributor Author

@macchian is there a need for a new m4 file. Can we reuse sof-glk-da7219.m4 if the codec combination is the same?

I'm afraid not. Because the I2s MCLK/BCLK/LRCLK clock settings is different between glk and cml.

@ranj063

ranj063 commented Jun 14, 2019

Copy link
Copy Markdown
Collaborator

I'm afraid not. Because the I2s MCLK/BCLK/LRCLK clock settings is different between glk and cml.

@macchian what I meant was to use the same m4 file and set these values based on the platform. Take a look at sof-cml-rt5682.m4 for example. It is the same m4 file for both cml and whl

@plbossart

Copy link
Copy Markdown
Member

I'm afraid not. Because the I2s MCLK/BCLK/LRCLK clock settings is different between glk and cml.

@macchian what I meant was to use the same m4 file and set these values based on the platform. Take a look at sof-cml-rt5682.m4 for example. It is the same m4 file for both cml and whl

the clock tree is the same for WHL/CML. It's different for GLK/CML, so you probably need to have two m4 files.

@jajanusz

Copy link
Copy Markdown
Contributor

@macchian Please change target branch. You cannot push to release branch. Probably you want to merge it to master.

@macchian
macchian changed the base branch from cml-002-drop-stable to master June 28, 2019 04:40
@macchian

macchian commented Jul 4, 2019

Copy link
Copy Markdown
Contributor Author

@macchian Please change target branch. You cannot push to release branch. Probably you want to merge it to master.

Yes, I changed to mmaster branch. Please review. Thanks.

@paulstelian97 paulstelian97 left a comment •

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The commits which delete and then re-add the CMakeLists file should be squashed, so as not to break git bisect (that is, there shouldn't be a commit without that file). It's also hard to see what differences are from the original one.

@jajanusz

Copy link
Copy Markdown
Contributor

@ranj063 @macchian Is it the same as #1662 ? If so, please close this one.

@jajanusz jajanusz closed this Jul 24, 2019
@lgirdwood
lgirdwood deleted the macchian-patch-2 branch January 27, 2021 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants