OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology: Add jsl+ MX98360a amp with ALC5682 Headset codec 

Topology is modified to include another JSL+ product variant with
MX98360a AMP + ALC5682 Headset codec. Created a platform specific
for RT1015, included this and already existing MX98360a in
sof-jsl-rt5682.m4

Signed-off-by: Uday M Bhat <uday.m.bhat@intel.com>
This commit is contained in:
Uday M Bhat 2020-06-09 19:34:09 +05:30 committed by Liam Girdwood
parent a8ec8bf8c6
commit 4d005a0554
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/topology/CMakeLists.txt
View File

@ -137,7 +137,8 @@ set(TPLGS
"sof-jsl-da7219\;sof-jsl-da7219-mx98360a\;-DPLATFORM=jsl-dedede"
"sof-imx8mp-wm8960\;sof-imx8mp-wm8960"
"sof-smart-amplifier-nocodec\;sof-smart-amplifier-nocodec"
"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015"
"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015\;-DPLATFORM=jsl-rt1015"
"sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DPLATFORM=jsl-dedede"
)
add_custom_target(topologies ALL)

18
tools/topology/platform/intel/jsl-rt1015.m4 Normal file
View File

@ -0,0 +1,18 @@
#
# Jasperlake differentiation for pipelines and components
#
include(`platform/intel/icl.m4')
define(`SPK_INDEX', `1')
define(`SPK_NAME', `SSP1-Codec')
undefine(`SPK_DATA_FORMAT')
define(`SPK_DATA_FORMAT', `s24le')
define(`SET_SSP_CONFIG',
`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, 1, 24))')

19
tools/topology/sof-jsl-rt5682.m4
View File

@ -16,8 +16,7 @@ include(`common/tlv.m4')
include(`sof/tokens.m4')
# Include JasperLake DSP configuration
include(`platform/intel/icl.m4')
include(`platform/intel/dmic.m4')
include(`platform/intel/'PLATFORM`.m4')
DEBUG_START
@ -107,10 +106,10 @@ dnl buffer, periods, format,
dnl frames, deadline, priority, core)
# playback DAI is SSP1 using 2 periods
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
1, SSP, 1, SSP1-Codec,
PIPELINE_SOURCE_1, 2, s24le,
1, SSP, SPK_INDEX, SPK_NAME,
PIPELINE_SOURCE_1, 2, SPK_DATA_FORMAT,
1000, 0, 0)
# playback DAI is SSP0 using 2 periods
@ -173,13 +172,9 @@ DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 0, 24)))
# SSP 1 (ID: 6) ALC1015
DAI_CONFIG(SSP, 1, 6, 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_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 24)))
# SSP 1 (ID: 6)
DAI_CONFIG(SSP, SPK_INDEX, 6, SPK_NAME,
SET_SSP_CONFIG)
# 4 HDMI/DP outputs (ID: 3,4,5)
DAI_CONFIG(HDA, 0, 3, iDisp1,