Skip to content
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

Jump to bottom

[stable-v2.2] Missing topologies commits from jsl 005 #9492

Merged
merged 4 commits into from
Sep 20, 2024
Merged

[stable-v2.2] Missing topologies commits from jsl 005 #9492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f8785d
Revert "topology: sof-jsl-rt5682: add SSP_CC_BCLK_ES flag to codec DAI"
brentlu Sep 19, 2024
defc9a3
topology: sof-jsl-rt5682: add support for cs42l42 with max98360a
brentlu Jul 28, 2021
9c4b7f0
topology: sof-jsl-rt5682: enable mclk always-on feature
brentlu Jun 27, 2022
5e561b4
topology1: sof-jsl-rt5650: support ALC5650
brentlu Aug 11, 2023
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
9 changes: 5 additions & 4 deletions tools/topology/topology1/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,12 @@ set(TPLGS
"sof-jsl-da7219\;sof-jsl-da7219\;-DPLATFORM=jsl"
"sof-jsl-da7219\;sof-jsl-da7219-mx98360a\;-DPLATFORM=jsl-dedede"
"sof-smart-amplifier-nocodec\;sof-smart-amplifier-nocodec"
"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015\;-DPLATFORM=jsl-rt1015"
"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015-xperi\;-DPLATFORM=jsl-rt1015\;-DINCLUDE_IIR_EQ=1"
"sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DPLATFORM=jsl-dedede"
"sof-jsl-rt5682\;sof-jsl-cs42l42-mx98360a\;-DPLATFORM=jsl-dedede"
"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015\;-DHEADPHONE=rt5682\;-DPLATFORM=jsl-rt1015"
"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015-xperi\;-DHEADPHONE=rt5682\;-DPLATFORM=jsl-rt1015\;-DINCLUDE_IIR_EQ=1"
"sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DHEADPHONE=rt5682\;-DPLATFORM=jsl-dedede"
"sof-jsl-rt5682\;sof-jsl-cs42l42-mx98360a\;-DHEADPHONE=cs42l42\;-DPLATFORM=jsl-dedede"
"sof-jsl-rt5682\;sof-jsl-rt5682\;-DHEADPHONE=rt5682\;-DPLATFORM=icl\;-DNO_AMP"
"sof-jsl-rt5682\;sof-jsl-rt5650\;-DHEADPHONE=rt5650\;-DPLATFORM=jsl-rt1015"

## DRC/EQ topologies
"sof-tgl-max98357a-rt5682\;sof-adl-max98357a-rt5682-drceq\;-DCODEC=MAX98357A\;-DFMT=s16le\;-DPLATFORM=adl\;-DLINUX_MACHINE_DRIVER=sof_rt5682\;-DAMP_SSP=2\;-DDYNAMIC=1\;-DDRC_EQ"
Expand Down
9 changes: 9 additions & 0 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 @@ -10,9 +10,18 @@ define(`SPK_NAME', `SSP1-Codec')
undefine(`SPK_DATA_FORMAT')
define(`SPK_DATA_FORMAT', `s24le')

ifelse(HEADPHONE, `rt5650', `
define(`SET_SSP_CONFIG',
`SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 3072000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 24, 0, 0, 0, SSP_CC_MCLK_AON))')
', `
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_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 24))')
')
25 changes: 23 additions & 2 deletions tools/topology/topology1/sof-jsl-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#
# Topology for JasperLake with rt5682 codec + DMIC + 3 HDMI + Speaker amp
# Topology for JasperLake with rt5682 or cs42l42 codec +
# DMIC +
# 3 HDMI +
# speaker amp
#

# Include topology builder
Expand All @@ -25,7 +28,7 @@ DEBUG_START
#
ifdef(`NO_AMP',`',`
# PCM0 ----> volume -----> SSP1 (Speaker - ALC1015)')
# PCM1 <---> volume <----> SSP0 (Headset - ALC5682)
`# PCM1 <---> volume <----> SSP0 (Headset - 'HEADPHONE`)'
# PCM2 ----> volume -----> iDisp1
# PCM3 ----> volume -----> iDisp2
# PCM4 ----> volume -----> iDisp3
Expand Down Expand Up @@ -176,13 +179,31 @@ dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
dnl SSP_CLOCK(clock, freq, codec_master, polarity)
dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id)

ifelse(HEADPHONE, `rt5682', `
# SSP 0 (ID: 0) ALC5682
DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
SSP_CLOCK(bclk, 2400000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 0, 24, 0, 0, 0, SSP_CC_MCLK_AON)))
', HEADPHONE, `cs42l42', `
# SSP 0 (ID: 0) CS42L42
DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
SSP_CLOCK(bclk, 2400000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 0, 24, 0, 0, 0, SSP_CC_BCLK_ES)))
', HEADPHONE, `rt5650', `
# SSP 0 (ID: 0) ALC5650-I2S1
DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
SSP_CLOCK(bclk, 3072000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, 32, 3, 3),
SSP_CONFIG_DATA(SSP, 0, 24, 0, 0, 0, SSP_CC_MCLK_AON)))
', )

ifdef(`NO_AMP',`',`
# SSP 1 (ID: 6)
Expand Down
Loading