Skip to content

Tools: Topology: Change occurrences of codec_master and codec_slave #6326

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.

Sign up for GitHub

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

Closed
singalsu wants to merge 2 commits into from
Closed

Tools: Topology: Change occurrences of codec_master and codec_slave #6326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef364d
Tools: Topology: Change codec_slave to codec_consumer
singalsu Sep 23, 2022
9a7aca2
Tools: Topology: Change occurrences of codec_master to codec_provider
singalsu Sep 23, 2022
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
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ PCM_CAPTURE_ADD(DMIC16kHz, 6, PIPELINE_PCM_3)
#SSP 5 (ID: 0)
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 3072000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 3072000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 5, 24)))

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-apl-asrc-wm8804.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ PCM_DUPLEX_ADD(Port5, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)

DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 3072000, codec_master),
SSP_CLOCK(fsync, 48000, codec_master),
SSP_CLOCK(bclk, 3072000, codec_provider),
SSP_CLOCK(fsync, 48000, codec_provider),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 5, 24)))

Expand Down
24 changes: 12 additions & 12 deletions tools/topology/topology1/development/sof-apl-nocodec-ci.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,44 +268,44 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)
DAI_CONFIG(SSP, 0, 0, NoCodec-0,
dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 1536000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 1536000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 16, 3, 3),
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks)
SSP_CONFIG_DATA(SSP, 0, 16, 0, SSP_QUIRK_LBM)))

DAI_CONFIG(SSP, 1, 1, NoCodec-1,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 1536000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 1536000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 16, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 16, 0, SSP_QUIRK_LBM)))

#DAI_CONFIG(SSP, 2, 2, NoCodec-2,
# SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
# SSP_CLOCK(bclk, 1536000, codec_slave),
# SSP_CLOCK(fsync, 48000, codec_slave),
# SSP_CLOCK(bclk, 1536000, codec_consumer),
# SSP_CLOCK(fsync, 48000, codec_consumer),
# SSP_TDM(2, 16, 3, 3),
# SSP_CONFIG_DATA(SSP, 2, 16, 0, SSP_QUIRK_LBM)))

DAI_CONFIG(SSP, 3, 3, NoCodec-3,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 1536000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 1536000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 16, 3, 3),
SSP_CONFIG_DATA(SSP, 3, 16, 0, SSP_QUIRK_LBM)))

#DAI_CONFIG(SSP, 4, 4, NoCodec-4,
# SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
# SSP_CLOCK(bclk, 1536000, codec_slave),
# SSP_CLOCK(fsync, 48000, codec_slave),
# SSP_CLOCK(bclk, 1536000, codec_consumer),
# SSP_CLOCK(fsync, 48000, codec_consumer),
# SSP_TDM(2, 16, 3, 3),
# SSP_CONFIG_DATA(SSP, 4, 16, 0, SSP_QUIRK_LBM)))

DAI_CONFIG(SSP, 5, 5, NoCodec-5,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 1536000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 1536000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 16, 3, 3),
SSP_CONFIG_DATA(SSP, 5, 16, 0, SSP_QUIRK_LBM)))

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)
DAI_CONFIG(SSP, 0, 0, NoCodec-0,
dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 6144000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 6144000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(4, 32, 15, 15),
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks)
SSP_CONFIG_DATA(SSP, 0, 32, 0, SSP_QUIRK_LBM)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)
DAI_CONFIG(SSP, 0, 0, NoCodec-0,
dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 6144000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 6144000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(4, 32, 15, 15),
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks)
SSP_CONFIG_DATA(SSP, 0, 32, 0, SSP_QUIRK_LBM)))
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1)
#SSP 5 (ID: 0)
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 3072000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 3072000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 5, 24)))

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1)
#SSP 5 (ID: 0)
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
SSP_CLOCK(bclk, 3200000, codec_slave),
SSP_CLOCK(fsync, 50000, codec_slave),
SSP_CLOCK(bclk, 3200000, codec_consumer),
SSP_CLOCK(fsync, 50000, codec_consumer),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 5, 24)))

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-apl-src-pcm512x.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ PCM_CAPTURE_ADD(DMIC16kHz, 6, PIPELINE_PCM_3)
#SSP 5 (ID: 0)
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 3072000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 3072000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 5, 24)))

Expand Down
8 changes: 4 additions & 4 deletions tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,15 @@ PCM_PLAYBACK_ADD(Speakers, 5, PIPELINE_PCM_7)
#SSP SSP_INDEX (ID: 0)
DAI_CONFIG(SSP, SSP_INDEX, 0, SSP_NAME,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK_RATE, codec_mclk_in),
SSP_CLOCK(bclk, 2400000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 2400000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, SSP_INDEX, 24)))

DAI_CONFIG(SSP, SSP1_INDEX, 6, SSP1_NAME,
SSP_CONFIG(DSP_A, SSP_CLOCK(mclk, SSP1_MCLK_RATE, codec_mclk_in),
SSP_CLOCK(bclk, 4800000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 4800000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(4, 25, 3, 15),
SSP_CONFIG_DATA(SET_SSP1_CONFIG_DATA)))

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-cml-src-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_6)
#SSP 1 (ID: 0)
DAI_CONFIG(SSP, 1, 0, SSP1-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
SSP_CLOCK(bclk, 2400000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 2400000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 24)))

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 1, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 1, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ COMPR_CAPTURE_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 1, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 1, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8-src-cs42888.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
dnl DAI_CONFIG(type, idx, link_id, name, esai_config)
DAI_CONFIG(ESAI, 0, 0, esai0-cs42888,
ESAI_CONFIG(I2S, ESAI_CLOCK(mclk, 49152000, codec_mclk_in),
ESAI_CLOCK(bclk, 3072000, codec_slave),
ESAI_CLOCK(fsync, 48000, codec_slave),
ESAI_CLOCK(bclk, 3072000, codec_consumer),
ESAI_CLOCK(fsync, 48000, codec_consumer),
ESAI_TDM(2, 32, 3, 3),
ESAI_CONFIG_DATA(ESAI, 0, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8-src-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 1, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 3, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 3, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ COMPR_CAPTURE_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 3, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 3, 0)))
4 changes: 2 additions & 2 deletions tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
dnl DAI_CONFIG(type, idx, link_id, name, sai_config)
DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi,
SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in),
SAI_CLOCK(bclk, 3072000, codec_master),
SAI_CLOCK(fsync, 48000, codec_master),
SAI_CLOCK(bclk, 3072000, codec_provider),
SAI_CLOCK(fsync, 48000, codec_provider),
SAI_TDM(2, 32, 3, 3),
SAI_CONFIG_DATA(SAI, 3, 0)))
8 changes: 4 additions & 4 deletions tools/topology/topology1/development/sof-tgl-nocodec-ci.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,15 @@ PCM_CAPTURE_ADD(DMIC16kHz, 5, PIPELINE_PCM_9)

DAI_CONFIG(SSP, 0, 0, NoCodec-0,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 38400000, codec_mclk_in),
SSP_CLOCK(bclk, 2400000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 2400000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 0, 24, 0, SSP_QUIRK_LBM)))

DAI_CONFIG(SSP, 1, 1, NoCodec-1,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 38400000, codec_mclk_in),
SSP_CLOCK(bclk, 2400000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 2400000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 24, 0, SSP_QUIRK_LBM)))

Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology1/platform/common/acp-hs.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ divert(-1)

dnl ACPHS related macros

dnl ACP_CLOCK(clock, freq, codec_master, polarity)
dnl ACP_CLOCK(clock, freq, codec_provider, polarity)
dnl polarity is optional
define(`ACP_CLOCK',
$1 STR($3)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology1/platform/common/acp-sp.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ divert(-1)

dnl ACPSP related macros

dnl ACP_CLOCK(clock, freq, codec_master, polarity)
dnl ACP_CLOCK(clock, freq, codec_provider, polarity)
dnl polarity is optional
define(`ACP_CLOCK',
$1 STR($3)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology1/platform/common/esai.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ divert(-1)

dnl ESAI related macros

dnl ESAI_CLOCK(clock, freq, codec_master, polarity)
dnl ESAI_CLOCK(clock, freq, codec_provider, polarity)
dnl polarity is optional
define(`ESAI_CLOCK',
$1 STR($3)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology1/platform/common/sai.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ divert(-1)

dnl SAI related macros

dnl SAI_CLOCK(clock, freq, codec_master, polarity)
dnl SAI_CLOCK(clock, freq, codec_provider, polarity)
dnl polarity is optional
define(`SAI_CLOCK',
$1 STR($3)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology1/platform/common/ssp.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ divert(-1)

dnl SSP related macros

dnl SSP_CLOCK(clock, freq, codec_master, polarity)
dnl SSP_CLOCK(clock, freq, codec_provider, polarity)
dnl polarity is optional
define(`SSP_CLOCK',
$1 STR($3)
Expand Down
12 changes: 6 additions & 6 deletions tools/topology/topology1/platform/intel/intel-generic-bt.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,18 @@ define(`data_names', DAI_DATA_NAMES(LIST(` ', "ssp_data1", "ssp_data2", "ssp
# Note WB is put as default in the list
define(`ssp_config_list_1', LIST(`',
`MULTI_SSP_CONFIG(hw_config1, HW_CONFIG_ID, DSP_A, SSP_CLOCK(mclk, BT_MCLK, codec_mclk_in),'
`SSP_CLOCK(bclk, 256000, codec_master, inverted),'
`SSP_CLOCK(fsync, 16000, codec_master),'
`SSP_CLOCK(bclk, 256000, codec_provider, inverted),'
`SSP_CLOCK(fsync, 16000, codec_provider),'
`SSP_TDM(1, 16, 1, 1),'
`SSP_MULTI_CONFIG_DATA(ssp_data1, 16))',
`MULTI_SSP_CONFIG(hw_config2, eval(HW_CONFIG_ID + 1), DSP_A, SSP_CLOCK(mclk, BT_MCLK, codec_mclk_in),'
`SSP_CLOCK(bclk, 128000, codec_master, inverted),'
`SSP_CLOCK(fsync, 8000, codec_master),'
`SSP_CLOCK(bclk, 128000, codec_provider, inverted),'
`SSP_CLOCK(fsync, 8000, codec_provider),'
`SSP_TDM(1, 16, 1, 1),'
`SSP_MULTI_CONFIG_DATA(ssp_data2, 16))',
`MULTI_SSP_CONFIG(hw_config3, eval(HW_CONFIG_ID + 2), DSP_A, SSP_CLOCK(mclk, BT_MCLK, codec_mclk_in),'
`SSP_CLOCK(bclk, 1536000, codec_slave),'
`SSP_CLOCK(fsync, 48000, codec_slave),'
`SSP_CLOCK(bclk, 1536000, codec_consumer),'
`SSP_CLOCK(fsync, 48000, codec_consumer),'
`SSP_TDM(2, 16, 3, 0),'
`SSP_MULTI_CONFIG_DATA(ssp_data3, 16))'))

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology1/platform/intel/jsl-dedede.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define(`SPK_DATA_FORMAT', `s24le')

define(`SET_SSP_CONFIG',
`SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
SSP_CLOCK(bclk, 2304000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 2304000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 24, 3, 3),
SSP_CONFIG_DATA(SSP, SPK_INDEX, 24, 0))')
4 changes: 2 additions & 2 deletions tools/topology/topology1/platform/intel/jsl-rt1015.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define(`SPK_DATA_FORMAT', `s24le')

define(`SET_SSP_CONFIG',
`SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
SSP_CLOCK(bclk, 3072000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 3072000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 24))')
4 changes: 2 additions & 2 deletions tools/topology/topology1/platform/intel/jsl.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ define(`SPK_DATA_FORMAT', `s16le')

define(`SET_SSP_CONFIG',
`SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
SSP_CLOCK(bclk, 4800000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, 4800000, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(4, 25, 3, 240),
SSP_CONFIG_DATA(SSP, SPK_INDEX, 16))'
)
Loading