Skip to content

topology: Add CML topology support for da7219+max98357a variant - #1662

Closed
macchian wants to merge 1 commit into
masterfrom
macchian-patch-3
Closed

macchian wants to merge 1 commit into
masterfrom
macchian-patch-3

Conversation

@macchian

Copy link
Copy Markdown
Contributor

add the topology files for Cometlake
with Intel ASoC DMIC capture, HDMI playback
with analog codec da7219 on SSP0 for headphone playback/headset mic
with digital codec max98357a on SSP1 for speaker playback

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

@ranj063

ranj063 commented Jul 23, 2019

Copy link
Copy Markdown
Collaborator

please squash the two commits and fix the commit message with proper prefix: "topology: cml: ...."

@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.

In addition to what @ranj063 wrote, please add also Signed-off-by line to every commit.

@macchian

Copy link
Copy Markdown
Contributor Author

In addition to what @ranj063 wrote, please add also Signed-off-by line to every commit.

Thanks, @ranj063, @jajanusz . I can't find a way to modify commit messages alone in these two commits? Should I delete them and resubmit again?

@jajanusz

Copy link
Copy Markdown
Contributor

@macchian Just do changes in your git repo and force push them. F.e.:

git rebase --interactive HEAD~2
# then in editor squash 2nd commit
# then rebase will continue and will ask your for commit message for both, update it
git push --force

@macchian

Copy link
Copy Markdown
Contributor Author

@macchian Just do changes in your git repo and force push them. F.e.:

git rebase --interactive HEAD~2
# then in editor squash 2nd commit
# then rebase will continue and will ask your for commit message for both, update it
git push --force

Thanks for your guidance. updated for your reviewing!

@plbossart

Copy link
Copy Markdown
Member

@macchian is there a machine driver for this configuration?

@ranj063

ranj063 commented Jul 23, 2019

Copy link
Copy Markdown
Collaborator

@macchian any particular reason to split this topology into 2 m4 files? Do you anticipate to have other variants with sof-cml-da7219.m4 as the base and a different codec for the speaker?

Also please squash the 2 commits.

@macchian

Copy link
Copy Markdown
Contributor Author

@macchian is there a machine driver for this configuration?

@plbossart , yes, I had it and verified. I will upstream soon for reviewing.

@macchian

Copy link
Copy Markdown
Contributor Author

@macchian any particular reason to split this topology into 2 m4 files? Do you anticipate to have other variants with sof-cml-da7219.m4 as the base and a different codec for the speaker?

Also please squash the 2 commits.

so far no. sof-cml-da7219 just pre-reserved. Because we might have setupbox sku in the feature. Any suggestion?

@plbossart

Copy link
Copy Markdown
Member

@macchian is there a machine driver for this configuration?

@plbossart , yes, I had it and verified. I will upstream soon for reviewing.

I don't want a new machine driver for this configuration which looks very similar to APL/GLK with the same parts. We need to reuse and configure the links. Please submit your code asap.

@xiulipan xiulipan 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
Please fix the DMIC config for the build error.

Comment thread tools/topology/sof-cml-da7219.m4 Outdated
@macchian

macchian commented Aug 1, 2019

Copy link
Copy Markdown
Contributor Author

@macchian is there a machine driver for this configuration?

@plbossart , yes, I had it and verified. I will upstream soon for reviewing.

I don't want a new machine driver for this configuration which looks very similar to APL/GLK with the same parts. We need to reuse and configure the links. Please submit your code asap.

@plbossart , thanks for advises. Yes, I reuse the kbl machine driver for cml platform instead. submit here for review https://patchwork.kernel.org/patch/11070247/

add the topology files for Cometlake
with Intel ASoC DMIC 4ch capture, HDMI1/2/3 playback
with analog codec da7219 on SSP0 for headphone playback/headset mic
with digital codec max98357a on SSP1 for speaker playback

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

macchian commented Sep 4, 2019

Copy link
Copy Markdown
Contributor Author

@xiulipan @ranj063 @jajanusz ,
I'm doing this commit rebase into master branch. However, the file uncounted a build error as below:
"fatal error: Invalid parameters (9) to PIPELINE_PCM_ADD"

Per checking the patch list, I found the dai parameters increased by following patch
"topology: enable pcm range and pipeline rate and remove frame count"

I modified all these relevant changes in this commit
example:
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1, 1, 2, s32le,

  •   48, 1000, 0, 0)
    
  •   1000, 0, 0,
    
  •   48000, 48000, 48000)
    

    When applied this modified tplg, I can not playback as usual on device. I saw the errors

[ 8.741126] sof-audio-pci 0000:00:1f.3: error: no reply expected, received 0x0
[ 8.830050] sof-audio-pci 0000:00:1f.3: firmware boot complete
[ 12.729620] sof-audio-pci 0000:00:1f.3: error: no reply expected, received 0x0
[ 12.818602] sof-audio-pci 0000:00:1f.3: firmware boot complete
[ 12.844939] sof-audio-pci 0000:00:1f.3: error: ipc error for 0x60010000 size 20
[ 12.844950] sof-audio-pci 0000:00:1f.3: error: hw params ipc failed for stream 1
[ 12.844955] sof-audio-pci 0000:00:1f.3: ASoC: 0000:00:1f.3 hw params failed: -22
[ 12.844960] Speakers: ASoC: hw_params FE failed -22

Do I miss anythings from the commits?

commit 77b6db8
Author: Jaska Uimonen jaska.uimonen@intel.com
Date: Thu Jan 3 14:11:21 2019 +0200

     "topology: enable pcm range and pipeline rate and remove frame count"

@xiulipan

xiulipan commented Sep 4, 2019

Copy link
Copy Markdown
Contributor

@macchian
As there are some tplg and fw chagne. Some new TPGL will not work with old FW.

You can see that #842 have a ton of fw patches also. So if you are working with some release branch fw, you should not use the tplg from master.

@macchian

macchian commented Sep 4, 2019

Copy link
Copy Markdown
Contributor Author

@macchian
As there are some tplg and fw chagne. Some new TPGL will not work with old FW.

You can see that #842 have a ton of fw patches also. So if you are working with some release branch fw, you should not use the tplg from master.

@xiulipan , thanks for your information. Currently I'm using the remotes/origin/cml-004-drop-stable and remotes/origin/cml-005-drop-stable fw image. And the tplg issue is existing on both versions. Do you have suggested FW branch to test?

In the meanwhile, do you think the commit can be approved to merge in master with specific FW branch version?

@xiulipan

xiulipan commented Sep 5, 2019

Copy link
Copy Markdown
Contributor

@macchian Then you need to rebase this patch to the FW branch cml-004-drop-stable or cml-005-drop-stable.

The key point is to make tplg binary build out from the same FW SOF repo

@macchian

macchian commented Sep 6, 2019

Copy link
Copy Markdown
Contributor Author

The key point is to make tplg binary build out from the same FW SOF repo

Thanks your advices! @xiulipan
I created a new PR to rebase to specific fw branch. The link is #1808 for your reviewing.
For #1662, I will modify it working on latest fw version.

@tlauda

tlauda commented Oct 15, 2019

Copy link
Copy Markdown
Contributor

@macchian Should we close this one?

@macchian

Copy link
Copy Markdown
Contributor Author

@macchian Should we close this one?

yes, we can close it. I've submitted the new version PR #1894 base on SOF 0.7 release.

@tlauda tlauda closed this Oct 16, 2019
@lgirdwood
lgirdwood deleted the macchian-patch-3 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.

6 participants