Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

topology: add multi-stream topology for GLK#20

Merged
lgirdwood merged 1 commit intothesofproject:masterfrom
ranj063:topology/glk
Jul 9, 2018
Merged

topology: add multi-stream topology for GLK#20
lgirdwood merged 1 commit intothesofproject:masterfrom
ranj063:topology/glk

Conversation

@ranj063
Copy link
Copy Markdown
Collaborator

@ranj063 ranj063 commented Jul 6, 2018

Add a multi-stream topology for GLK with speaker on SSP1, headset on
SSP2 and DMIC.

Signed-off-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com

Comment thread topology/sof-glk-codec.m4 Outdated
#
# Define the pipelines
#
# <---- volume <----- DMIC0 (dmic capture)
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.

PCM0

Comment thread topology/sof-glk-codec.m4 Outdated
#
# <---- volume <----- DMIC0 (dmic capture)
# PCM0 ----> volume -----> SSP1 (speaker - maxim98357a)
# PCM1 ----> volume -----> SSP2 (headset - da7219)
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.

PCM1
PCM2

Comment thread topology/sof-glk-codec.m4 Outdated
SSP_CONFIG_DATA(SSP, 1, 16, 1)))

#SSP 2 with 19.2MHz mclk with ID 1
DAI_CONFIG(SSP, 2, 1, SSP2-Codec,
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.

DAI_CONFIG(SSP, 2, 2, SSP2-Codec,...?

the 3rd param should not be duplicate with upper SSP1 one, and make sure they are coherent with machine driver.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Thanks, Keyon. I'll have to check which machine driver they're using for the GLK board and fix the id accordingly.

@ranj063
Copy link
Copy Markdown
Collaborator Author

ranj063 commented Jul 8, 2018

@keyonjie I've pushed the changes based SSP ID's in the GLK machine driver.

@ranj063 ranj063 force-pushed the topology/glk branch 3 times, most recently from ce0b260 to 81cd0ce Compare July 8, 2018 06:03
Add a multi-stream topology for GLK with speaker on SSP1, headset on
SSP2 and DMIC. Only playback pipelines on SSP1/2 for now. Capture
pipelines to be added later.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@lgirdwood lgirdwood merged commit 764f953 into thesofproject:master Jul 9, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants