Skip to content

topology: clean up platform specific macro #2461

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

Merged
lgirdwood merged 1 commit into from
Mar 4, 2020
Merged

topology: clean up platform specific macro #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions tools/topology/platform/intel/cml-mono.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include(`platform/intel/cnl.m4')

define(`MONO', `')
13 changes: 13 additions & 0 deletions tools/topology/platform/intel/cml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
include(`platform/intel/cnl.m4')

#SSP setting for CML platform
undefine(`SSP_INDEX')
define(`SSP_INDEX', 0)

undefine(`SSP_NAME')
define(`SSP_NAME', `SSP0-Codec')

undefine(`SSP_MCLK_RATE')
define(`SSP_MCLK_RATE', `24000000')

include(`platform/intel/dmic.m4')
12 changes: 12 additions & 0 deletions tools/topology/platform/intel/icl.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,15 @@ W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens,
LIST(` ', `SOF_TKN_SCHED_MIPS "5000"'))

W_DATA(pipe_dai_schedule_plat, pipe_dai_schedule_plat_tokens)

#SSP setting for ICL platform
undefine(`SSP_INDEX')
define(`SSP_INDEX', 0)

undefine(`SSP_NAME')
define(`SSP_NAME', `SSP0-Codec')

undefine(`SSP_MCLK_RATE')
define(`SSP_MCLK_RATE', `19200000')

include(`platform/intel/dmic.m4')
13 changes: 13 additions & 0 deletions tools/topology/platform/intel/whl.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
include(`platform/intel/cnl.m4')

#SSP setting for WHL platform
undefine(`SSP_INDEX')
define(`SSP_INDEX', 1)

undefine(`SSP_NAME')
define(`SSP_NAME', `SSP1-Codec')

undefine(`SSP_MCLK_RATE')
define(`SSP_MCLK_RATE', `24000000')

include(`platform/intel/dmic.m4')
11 changes: 2 additions & 9 deletions tools/topology/sof-cml-demux-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,11 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include Cannonlake DSP configuration
include(`platform/intel/cnl.m4')
include(`platform/intel/dmic.m4')
# Include platform specific DSP configuration
include(`platform/intel/'PLATFORM`.m4')

DEBUG_START

undefine(`SSP_INDEX')
define(`SSP_INDEX', ifelse(PLATFORM, `whl', `1',
ifelse(PLATFORM, `cml', `0', `')))
undefine(`SSP_NAME')
define(`SSP_NAME', ifelse(PLATFORM, `whl', `SSP1-Codec',
ifelse(PLATFORM, `cml', `SSP0-Codec', `')))

#
# Define the pipelines
Expand Down
22 changes: 2 additions & 20 deletions tools/topology/sof-cml-rt5682-kwd.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,13 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include Cannonlake or Icelake DSP configuration
ifelse(PLATFORM, `icl', include(`platform/intel/icl.m4'),
ifelse(PLATFORM, `whl', include(`platform/intel/cnl.m4'),
ifelse(PLATFORM, `cml', include(`platform/intel/cnl.m4'), `')))
include(`platform/intel/dmic.m4')
# Include Platform specific DSP configuration
include(`platform/intel/'PLATFORM`.m4')

define(KWD_PIPE_SCH_DEADLINE_US, 20000)

DEBUG_START

undefine(`SSP_INDEX')
define(`SSP_INDEX', ifelse(PLATFORM, `icl', `0',
ifelse(PLATFORM, `whl', `1',
ifelse(PLATFORM, `cml', `0', `'))))

undefine(`SSP_NAME')
define(`SSP_NAME', ifelse(PLATFORM, `icl', `SSP0-Codec',
ifelse(PLATFORM, `whl', `SSP1-Codec',
ifelse(PLATFORM, `cml', `SSP0-Codec', `'))))

undefine(`SSP_MCLK_RATE')
define(`SSP_MCLK_RATE', ifelse(PLATFORM, `icl', `19200000',
ifelse(PLATFORM, `whl', `24000000',
ifelse(PLATFORM, `cml', `24000000', `'))))

#
# Define the pipelines
#
Expand Down
22 changes: 2 additions & 20 deletions tools/topology/sof-cml-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,11 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include Cannonlake or Icelake DSP configuration
ifelse(PLATFORM, `icl', include(`platform/intel/icl.m4'),
ifelse(PLATFORM, `whl', include(`platform/intel/cnl.m4'),
ifelse(PLATFORM, `cml', include(`platform/intel/cnl.m4'), `')))
include(`platform/intel/dmic.m4')
# Include Platform specific DSP configuration
include(`platform/intel/'PLATFORM`.m4')

DEBUG_START

undefine(`SSP_INDEX')
define(`SSP_INDEX', ifelse(PLATFORM, `icl', `0',
ifelse(PLATFORM, `whl', `1',
ifelse(PLATFORM, `cml', `0', `'))))

undefine(`SSP_NAME')
define(`SSP_NAME', ifelse(PLATFORM, `icl', `SSP0-Codec',
ifelse(PLATFORM, `whl', `SSP1-Codec',
ifelse(PLATFORM, `cml', `SSP0-Codec', `'))))

undefine(`SSP_MCLK_RATE')
define(`SSP_MCLK_RATE', ifelse(PLATFORM, `icl', `19200000',
ifelse(PLATFORM, `whl', `24000000',
ifelse(PLATFORM, `cml', `24000000', `'))))

@plbossart plbossart Feb 28, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, it makes no sense to move this to a common code. This can only be used for cml-rt5682 based topology. The SSP_INDEX is really tied to a specific hw, it can't be reused blindly. NAK on this.

@fredoh9 fredoh9 Feb 28, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your comment. I will review again, any way I can make this simple and generic. I will think about belwo comments as well.

#
# Define the pipelines
#
Expand Down
3 changes: 1 addition & 2 deletions tools/topology/sof-cml-rt700.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ include(`common/tlv.m4')
include(`sof/tokens.m4')

# Include CML DSP configuration
include(`platform/intel/cnl.m4')
include(`platform/intel/dmic.m4')
include(`platform/intel/cml.m4')

DEBUG_START

Expand Down
5 changes: 2 additions & 3 deletions tools/topology/sof-cml-src-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include Cannonlake DSP configuration
include(`platform/intel/cnl.m4')
include(`platform/intel/dmic.m4')
# Include Cometlake DSP configuration
include(`platform/intel/cml.m4')

DEBUG_START

Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-cnl-rt274.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include Apollolake DSP configuration
# Include Cannonlake DSP configuration
include(`platform/intel/cnl.m4')

#
Expand Down
5 changes: 2 additions & 3 deletions tools/topology/sof-icl-dmic-4ch.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include Apollolake DSP configuration
include(`platform/intel/bxt.m4')
include(`platform/intel/dmic.m4')
# Include IceLake DSP configuration
include(`platform/intel/icl.m4')

#
# Define the pipelines
Expand Down
3 changes: 1 addition & 2 deletions tools/topology/sof-icl-rt700.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include ICL DSP configuration
# Include Icelake DSP configuration
include(`platform/intel/icl.m4')
include(`platform/intel/dmic.m4')

DEBUG_START

Expand Down
7 changes: 2 additions & 5 deletions tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

ifelse(PLATFORM, `icl', include(`platform/intel/icl.m4'),
ifelse(PLATFORM, `cml-mono', include(`platform/intel/cnl.m4'),
ifelse(PLATFORM, `cml', include(`platform/intel/cnl.m4'), `')))

ifelse(PLATFORM, `cml-mono', `define(`MONO', `')', `')
# Include Platform specific DSP configuration
include(`platform/intel/'PLATFORM`.m4')

DEBUG_START

Expand Down
2 changes: 1 addition & 1 deletion tools/topology/sof-icl-rt711-rt1308-rt715.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')

# Include ICL DSP configuration
# Include Icelake DSP configuration
include(`platform/intel/icl.m4')

DEBUG_START
Expand Down