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

tplg:token:add tokens for ssp register config #48

Closed
ghost wants to merge 1 commit into from
Closed

tplg:token:add tokens for ssp register config #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions topology/platform/common/ssp.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ define(`SSP_CONFIG',
$6
)

dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id)
dnl mclk_id is optional
dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id, quirks, frame_pulse_width)
dnl mclk_id quirks frame_pulse_width are optional
Copy link
Member

@lgirdwood lgirdwood Aug 8, 2018

Choose a reason for hiding this comment

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

@xiulipan is working on something similar which will restart after 1.2. Please align.

Copy link
Author

@ghost ghost Aug 8, 2018

Choose a reason for hiding this comment

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

this PR should be align with the kernel's PR "ssp:support additional SSP register bits #64".
the kernel's PR is merged.
I hope the tplg's update will not take much time.
the incompatible would cause problem.

Copy link
Contributor

@xiulipan xiulipan Aug 8, 2018

Choose a reason for hiding this comment

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

@lgirdwood
I would like to use some more vendor token for this. Because the alse-tplg have no such more config we have. we need to keep these config as bespoke vendor tuple.

define(`SSP_CONFIG_DATA',
`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {'
` tokens "sof_ssp_tokens"'
Expand All @@ -37,6 +37,12 @@ define(`SSP_CONFIG_DATA',
` tuples."short" {'
` SOF_TKN_INTEL_SSP_MCLK_ID' ifelse($4, `', "0", STR($4))
` }'
` tuples."word" {'
` SOF_TKN_INTEL_SSP_QUIRKS' ifelse($5, `', "0", STR($5))
` }'
` tuples."short" {'
` SOF_TKN_INTEL_SSP_FRAME_PULSE_WIDTH' ifelse($6, `', "0", STR($6))
` }'
`}'
`SectionData."'N_DAI_CONFIG($1$2)`_data" {'
` tuples "'N_DAI_CONFIG($1$2)`_tuples"'
Expand Down
2 changes: 1 addition & 1 deletion topology/sof-apl-nocodec.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ DAI_CONFIG(SSP, 0, 0, NoCodec-0,
SSP_CLOCK(bclk, 1536000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, 16, 3, 3),
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id)
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks, frame_pulse_width)
SSP_CONFIG_DATA(SSP, 0, 16)))

DAI_CONFIG(SSP, 1, 1, NoCodec-1,
Expand Down
1 change: 1 addition & 0 deletions topology/sof-apl-tdf8532.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
SSP_CLOCK(bclk, 1536000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, 16, 3, 3),
dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id, quirks, frame_pulse_width)
SSP_CONFIG_DATA(SSP, 0, 16)))

DAI_CONFIG(SSP, 1, 1, SSP1-Codec,
Expand Down
2 changes: 2 additions & 0 deletions topology/sof/tokens.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ SectionVendorTokens."sof_ssp_tokens" {
SOF_TKN_INTEL_SSP_FS_KEEP_ACTIVE "502"
SOF_TKN_INTEL_SSP_MCLK_ID "503"
SOF_TKN_INTEL_SSP_SAMPLE_BITS "504"
SOF_TKN_INTEL_SSP_FRAME_PULSE_WIDTH "505"
SOF_TKN_INTEL_SSP_QUIRKS "506"
}

SectionVendorTokens."sof_dmic_tokens" {
Expand Down