Skip to content

tgl-006-drop-stable: port DSM and DMIC patches from master #3006

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
RanderWang wants to merge 2 commits into from
Closed

tgl-006-drop-stable: port DSM and DMIC patches from master #3006

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
104226b
topology: tgl-max98373-rt5682: adjust channel usage for sdw DSM support
RanderWang May 28, 2020
2157774
topology: sdw: fix dmic issue on tgl sdw platforms
RanderWang May 29, 2020
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
6 changes: 4 additions & 2 deletions tools/topology/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ set(TPLGS
"sof-tgl-rt711-i2s-rt1308\;sof-tgl-rt711-i2s-rt1308-2ch\;-DHDMI=1\;-DCHANNELS=2"
"sof-tgl-rt711-i2s-rt1308\;sof-tgl-rt711-i2s-rt1308-4ch\;-DHDMI=1\;-DCHANNELS=4"
"sof-tgl-rt711-i2s-rt1308\;sof-tgl-rt711-i2s-rt1308-nohdmi"
"sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308"
"sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308-2ch\;-DCHANNELS=2"
"sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308-4ch\;-DCHANNELS=4"
"sof-tgl-rt5682\;sof-tgl-rt5682\;-DHDMI=1"
"sof-tgl-nocodec\;sof-ehl-nocodec"
"sof-ehl-rt5660\;sof-ehl-rt5660\;-DHDMI=1"
Expand All @@ -130,7 +131,8 @@ set(TPLGS
"sof-imx8qxp-wm8960\;sof-imx8qxp-wm8960"
"sof-tgl-max98357a-rt5682\;sof-tgl-max98357a-rt5682"
"sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682"
"sof-tgl-sdw-max98373-rt5682\;sof-tgl-sdw-max98373-rt5682\;-DSDW=1"
"sof-tgl-sdw-max98373-rt5682\;sof-tgl-sdw-max98373-rt5682-2ch\;-DSDW=1\;-DCHANNELS=2"
"sof-tgl-sdw-max98373-rt5682\;sof-tgl-sdw-max98373-rt5682-4ch\;-DSDW=1\;-DCHANNELS=4"
"sof-jsl-da7219\;sof-jsl-da7219\;-DPLATFORM=jsl"
"sof-jsl-da7219\;sof-jsl-da7219-mx98360a\;-DPLATFORM=jsl-dedede"
"sof-imx8mp-wm8960\;sof-imx8mp-wm8960"
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-smart-amplifier.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ ifelse(SDW, `1',
`
#ALH ALH Pin2 (ID: SMART_BE_ID)
DAI_CONFIG(ALH, SMART_ALH_INDEX, SMART_BE_ID, SMART_ALH_PLAYBACK_NAME,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, SMART_ALH_INDEX, 48000, 2)))
ALH_CONFIG(ALH_CONFIG_DATA(ALH, SMART_ALH_INDEX, 48000, SMART_TX_CHANNELS)))

#ALH ALH Pin3 (ID: SMART_BE_ID + 1)
DAI_CONFIG(ALH, eval(SMART_ALH_INDEX + 1), eval(SMART_BE_ID + 1), SMART_ALH_CAPTURE_NAME,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(SMART_ALH_INDEX + 1), 48000, 2)))
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(SMART_ALH_INDEX + 1), 48000, SMART_RX_CHANNELS)))
',
`
#SSP SSP_INDEX (ID: SMART_BE_ID)
Expand Down
13 changes: 8 additions & 5 deletions tools/topology/sof-tgl-rt711-rt1308.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ include(`sof/tokens.m4')

include(`platform/intel/tgl.m4')

define(DMIC_PDM_CONFIG, ifelse(CHANNELS, `4', ``FOUR_CH_PDM0_PDM1'',
`ifelse(CHANNELS, `2', ``STEREO_PDM0'', `')'))

DEBUG_START

#
Expand Down Expand Up @@ -70,7 +73,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
# Passthrough capture pipeline 5 on PCM 4 using max 4 channels.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
5, 4, 4, s16le,
5, 4, CHANNELS, s32le,
1000, 0, 0,
16000, 16000, 16000)

Expand Down Expand Up @@ -140,10 +143,10 @@ DAI_ADD(sof/pipe-dai-capture.m4,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC16k using 2 periods
# Buffers use s16le format, with 16 frame per 1000us on core 0 with priority 0
# Buffers use s32le format, with 16 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
5, DMIC, 1, dmic16k,
PIPELINE_SINK_5, 2, s16le,
PIPELINE_SINK_5, 2, s32le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is iDisp1 using 2 periods
Expand Down Expand Up @@ -211,8 +214,8 @@ DAI_CONFIG(DMIC, 0, 3, dmic01,
# dmic16k (ID: 4)
DAI_CONFIG(DMIC, 1, 4, dmic16k,
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
DMIC_WORD_LENGTH(s16le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, STEREO_PDM0)))
DMIC_WORD_LENGTH(s32le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, DMIC_PDM_CONFIG)))

# 3 HDMI/DP outputs (ID: 5,6,7)
DAI_CONFIG(HDA, 0, 5, iDisp1,
Expand Down
19 changes: 11 additions & 8 deletions tools/topology/sof-tgl-sdw-max98373-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ include(`sof/tokens.m4')
include(`platform/intel/tgl.m4')
include(`platform/intel/dmic.m4')

define(DMIC_PDM_CONFIG, ifelse(CHANNELS, `4', ``FOUR_CH_PDM0_PDM1'',
`ifelse(CHANNELS, `2', ``STEREO_PDM0'', `')'))

DEBUG_START

#
Expand Down Expand Up @@ -51,9 +54,9 @@ define(`SMART_BE_ID', 2)
# Playback related
define(`SMART_PB_PPL_ID', 3)
define(`SMART_PB_CH_NUM', 2)
define(`SMART_TX_CHANNELS', 4)
define(`SMART_RX_CHANNELS', 8)
define(`SMART_FB_CHANNELS', 8)
define(`SMART_TX_CHANNELS', 2)
define(`SMART_RX_CHANNELS', 4)
define(`SMART_FB_CHANNELS', 4)
# Ref capture related
define(`SMART_REF_PPL_ID', 4)
define(`SMART_REF_CH_NUM', 4)
Expand Down Expand Up @@ -92,7 +95,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
# Passthrough capture pipeline 5 on PCM 4 using max 4 channels.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
6, 5, 4, s16le,
6, 5, CHANNELS, s32le,
1000, 0, 0,
16000, 16000, 16000)

Expand Down Expand Up @@ -155,10 +158,10 @@ DAI_ADD(sof/pipe-dai-capture.m4,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# capture DAI is DMIC16k using 2 periods
# Buffers use s16le format, with 16 frame per 1000us on core 0 with priority 0
# Buffers use s32le format, with 16 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 1, dmic16k,
PIPELINE_SINK_6, 2, s16le,
PIPELINE_SINK_6, 2, s32le,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

# playback DAI is iDisp1 using 2 periods
Expand Down Expand Up @@ -224,8 +227,8 @@ DAI_CONFIG(DMIC, 0, 4, dmic01,
# dmic16k (ID: 5)
DAI_CONFIG(DMIC, 1, 5, dmic16k,
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
DMIC_WORD_LENGTH(s16le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, STEREO_PDM0)))
DMIC_WORD_LENGTH(s32le), 400, DMIC, 1,
PDM_CONFIG(DMIC, 1, DMIC_PDM_CONFIG)))

# 4 HDMI/DP outputs (ID: 6,7,8,9)
DAI_CONFIG(HDA, 0, 6, iDisp1,
Expand Down