Skip to content

Commit 85a4c4b

Browse files
brentlulgirdwood
authored andcommitted
topology: sof-jsl-rt5682: add sof-jsl-rt5682.tplg
This topology supports JSL boards which implement ALC5682I-VD/VS on SSP0 port without speaker amplifier. Signed-off-by: Brent Lu <brent.lu@intel.com> (cherry picked from commit 8a394bb)
1 parent 343cd3b commit 85a4c4b

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

tools/topology/topology1/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ set(TPLGS
200200
"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015-xperi\;-DPLATFORM=jsl-rt1015\;-DINCLUDE_IIR_EQ=1"
201201
"sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DPLATFORM=jsl-dedede"
202202
"sof-jsl-rt5682\;sof-jsl-cs42l42-mx98360a\;-DPLATFORM=jsl-dedede"
203+
"sof-jsl-rt5682\;sof-jsl-rt5682\;-DHEADPHONE=rt5682\;-DPLATFORM=icl\;-DNO_AMP"
203204

204205
"sof-glk-es8336\;sof-apl-es8336\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0"
205206
"sof-glk-es8336\;sof-apl-es8336-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=0"

tools/topology/topology1/sof-jsl-rt5682.m4

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ DEBUG_START
2323
#
2424
# Define the pipelines
2525
#
26-
# PCM0 ----> volume -----> SSP1 (Speaker - ALC1015)
26+
ifdef(`NO_AMP',`',`
27+
# PCM0 ----> volume -----> SSP1 (Speaker - ALC1015)')
2728
# PCM1 <---> volume <----> SSP0 (Headset - ALC5682)
2829
# PCM2 ----> volume -----> iDisp1
2930
# PCM3 ----> volume -----> iDisp2
@@ -55,6 +56,7 @@ dnl PIPELINE_PCM_ADD(pipeline,
5556
dnl pipe id, pcm, max channels, format,
5657
dnl frames, deadline, priority, core)
5758

59+
ifdef(`NO_AMP',`',`
5860
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
5961
# Schedule 48 frames per 1000us deadline with priority 0 on core 0
6062
define(ENDPOINT_NAME, `Speakers')
@@ -63,7 +65,7 @@ PIPELINE_PCM_ADD(
6365
1, 0, 2, s32le,
6466
1000, 0, 0,
6567
48000, 48000, 48000)
66-
undefine(ENDPOINT_NAME)
68+
undefine(ENDPOINT_NAME)')
6769

6870
# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le.
6971
# Schedule 48 frames per 1000us deadline with priority 0 on core 0
@@ -113,12 +115,13 @@ dnl pipe id, dai type, dai_index, dai_be,
113115
dnl buffer, periods, format,
114116
dnl frames, deadline, priority, core)
115117

118+
ifdef(`NO_AMP',`',`
116119
# playback DAI is SSP1 using 2 periods
117120
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
118121
DAI_ADD(sof/pipe-dai-playback.m4,
119122
1, SSP, SPK_INDEX, SPK_NAME,
120123
PIPELINE_SOURCE_1, 2, SPK_DATA_FORMAT,
121-
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
124+
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)')
122125

123126
# playback DAI is SSP0 using 2 periods
124127
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
@@ -157,7 +160,8 @@ DAI_ADD(sof/pipe-dai-playback.m4,
157160

158161
# PCM Low Latency, id 0
159162
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
160-
PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_1)
163+
ifdef(`NO_AMP',`',`
164+
PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_1)')
161165
PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)
162166
PCM_PLAYBACK_ADD(HDMI1, 2, PIPELINE_PCM_5)
163167
PCM_PLAYBACK_ADD(HDMI2, 3, PIPELINE_PCM_6)
@@ -180,9 +184,10 @@ DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
180184
SSP_TDM(2, 25, 3, 3),
181185
SSP_CONFIG_DATA(SSP, 0, 24, 0, 0, 0, SSP_CC_BCLK_ES)))
182186

187+
ifdef(`NO_AMP',`',`
183188
# SSP 1 (ID: 6)
184189
DAI_CONFIG(SSP, SPK_INDEX, 6, SPK_NAME,
185-
SET_SSP_CONFIG)
190+
SET_SSP_CONFIG)')
186191

187192
# 4 HDMI/DP outputs (ID: 3,4,5)
188193
DAI_CONFIG(HDA, 0, 3, iDisp1,

0 commit comments

Comments
 (0)