From e112e0bc0f885e4398fa09f1b14616cf44e6b142 Mon Sep 17 00:00:00 2001 From: Vamshi Krishna Date: Tue, 11 May 2021 10:41:08 +0530 Subject: [PATCH] topology: sof-tgl-sdw-max98373-rt5682: add support for ADL For speakers SDW2 link is used. For Headset SDW0 link is used. add sof-adl-sdw-max98373-rt5682 topology Signed-off-by: Vamshi Krishna --- tools/topology/CMakeLists.txt | 3 ++- tools/topology/sof-tgl-sdw-max98373-rt5682.m4 | 23 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index d3beec559..b7c7f744d 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -136,7 +136,8 @@ set(TPLGS "sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682-xperi\;-DAMP_SSP=1\;-DINCLUDE_IIR_EQ=1" "sof-tgl-max98373-rt5682\;sof-tgl-rt5682-ssp0-max98373-ssp2\;-DAMP_SSP=2" "sof-tgl-max98373-rt5682\;sof-tgl-rt5682-ssp0-max98373-ssp2-xperi\;-DAMP_SSP=2\;-DINCLUDE_IIR_EQ=1" - "sof-tgl-sdw-max98373-rt5682\;sof-tgl-sdw-max98373-rt5682\;-DCHANNELS=4" + "sof-tgl-sdw-max98373-rt5682\;sof-tgl-sdw-max98373-rt5682\;-DCHANNELS=4\;-DPLATFORM=tgl" + "sof-tgl-sdw-max98373-rt5682\;sof-adl-sdw-max98373-rt5682\;-DCHANNELS=4\;-DPLATFORM=adl" "sof-jsl-da7219\;sof-jsl-da7219\;-DPLATFORM=jsl" "sof-jsl-da7219\;sof-jsl-da7219-mx98360a\;-DPLATFORM=jsl-dedede" "sof-imx8mp-wm8960\;sof-imx8mp-wm8960" diff --git a/tools/topology/sof-tgl-sdw-max98373-rt5682.m4 b/tools/topology/sof-tgl-sdw-max98373-rt5682.m4 index fcb59c1b8..9b6e3e2fb 100644 --- a/tools/topology/sof-tgl-sdw-max98373-rt5682.m4 +++ b/tools/topology/sof-tgl-sdw-max98373-rt5682.m4 @@ -16,7 +16,7 @@ include(`common/tlv.m4') include(`sof/tokens.m4') # Include Tigerlake DSP configuration -include(`platform/intel/tgl.m4') +include(`platform/intel/'PLATFORM`.m4') include(`platform/intel/dmic.m4') define(DMIC_PDM_CONFIG, ifelse(CHANNELS, `4', ``FOUR_CH_PDM0_PDM1'', @@ -29,11 +29,11 @@ DEBUG_START # # PCM0 <---> volume <----> playback (Headset - ALC5682) # PCM1 <---> volume <----> capture (Headset - ALC5682) -# PCM2 ----> smart_amp ----> ALH0x102 (Speaker -max98373) +# PCM2 ----> smart_amp ----> ALH0xy02 (Speaker -max98373) # ^ # | # | -# PCM3 <---- demux <----- ALH0x103 (Speaker -max98373) +# PCM3 <---- demux <----- ALH0xy03 (Speaker -max98373) # PCM5 ----> volume -----> iDisp1 # PCM6 ----> volume -----> iDisp2 # PCM7 ----> volume -----> iDisp3 @@ -46,11 +46,18 @@ define(`SDW', 1) # Smart amplifier related # ALH related -#define smart amplifier ALH index -define(`SMART_ALH_INDEX', 0x102) -#define ALH BE dai_link name -define(`SMART_ALH_PLAYBACK_NAME', `SDW1-Playback') -define(`SMART_ALH_CAPTURE_NAME', `SDW1-Capture') +ifelse(PLATFORM, `tgl', +` #define smart amplifier ALH index + define(`SMART_ALH_INDEX', 0x102) + #define ALH BE dai_link name + define(`SMART_ALH_PLAYBACK_NAME', `SDW1-Playback') + define(`SMART_ALH_CAPTURE_NAME', `SDW1-Capture') +', `') +ifelse(PLATFORM, `adl', +` define(`SMART_ALH_INDEX', 0x202) + define(`SMART_ALH_PLAYBACK_NAME', `SDW2-Playback') + define(`SMART_ALH_CAPTURE_NAME', `SDW2-Capture') +', `') #define BE dai_link ID define(`SMART_BE_ID', 2)