Skip to content

Topology: Add ALH config #2675

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
Apr 1, 2020
Merged

Topology: Add ALH config #2675

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
4 changes: 4 additions & 0 deletions src/include/kernel/tokens.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,8 @@
#define SOF_TKN_MUTE_LED_USE 1300
#define SOF_TKN_MUTE_LED_DIRECTION 1301

/* ALH */
#define SOF_TKN_INTEL_ALH_RATE 1400
#define SOF_TKN_INTEL_ALH_CH 1401

#endif /* __KERNEL_TOKENS_H__ */
4 changes: 2 additions & 2 deletions tools/topology/m4/dai.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ define(`DO_DAI_CONFIG',
`'
` id "'$3`"'
`'
` ifelse($1, `SSP', $5, $1, `ESAI', $5, $1, `SAI', $5, `}')'
` ifelse($1, `SSP', $5, $1, `ALH', $5, $1, `ESAI', $5, $1, `SAI', $5, `}')'
`ifelse($1, `DMIC', $5, `')'
`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_common" {'
` tokens "sof_dai_tokens"'
Expand All @@ -155,7 +155,7 @@ define(`DO_DAI_CONFIG',
` "'$1$2`"'
` ]'
` data ['
` ifelse($1, `HDA', `', ifelse($1, `ALH', `', "'N_DAI_CONFIG($1$2)`_data"))'
` ifelse($1, `HDA', `', `"'N_DAI_CONFIG($1$2)`_data"')'
` "'N_DAI_CONFIG($1$2)`_data_common"'
`ifelse($1, `DMIC',` "'N_DAI_CONFIG($1$2)`_pdm_data"', `')'
` ]'
Expand Down
25 changes: 25 additions & 0 deletions tools/topology/platform/common/alh.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
divert(-1)

dnl ALH related macros

dnl ALH_CONFIG(alh_config_data)
define(`ALH_CONFIG',
`}'
$1
)

dnl ALH_CONFIG_DATA(type, idx, rate, channels)
define(`ALH_CONFIG_DATA',
`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {'
` tokens "sof_alh_tokens"'
` tuples."word" {'
` SOF_TKN_INTEL_ALH_RATE' STR($3)
` SOF_TKN_INTEL_ALH_CH' STR($4)
` }'
`}'
`SectionData."'N_DAI_CONFIG($1$2)`_data" {'
` tuples "'N_DAI_CONFIG($1$2)`_tuples"'
`}'
)

divert(0)dnl
7 changes: 5 additions & 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 @@ -6,6 +6,7 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`alh.m4')

# Include TLV library
include(`common/tlv.m4')
Expand Down Expand Up @@ -159,10 +160,12 @@ PCM_PLAYBACK_ADD(HDMI3, 6, PIPELINE_PCM_7)

#ALH dai index = ((link_id << 8) | PDI id)
#ALH SDW1 Pin2 (ID: 0)
DAI_CONFIG(ALH, 0x102, 0, SDW1-Playback)
DAI_CONFIG(ALH, 0x102, 0, SDW1-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x102, 48000, 2)))

#ALH SDW1 Pin3 (ID: 1)
DAI_CONFIG(ALH, 0x103, 1, SDW1-Capture)
DAI_CONFIG(ALH, 0x103, 1, SDW1-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x103, 48000, 2)))

# dmic01 (ID: 1)
DAI_CONFIG(DMIC, 0, 2, dmic01,
Expand Down
7 changes: 5 additions & 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 @@ -6,6 +6,7 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`alh.m4')

# Include TLV library
include(`common/tlv.m4')
Expand Down Expand Up @@ -159,10 +160,12 @@ PCM_PLAYBACK_ADD(HDMI3, 6, PIPELINE_PCM_7)

#ALH dai index = ((link_id << 8) | PDI id)
#ALH SDW0 Pin2 (ID: 0)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 2, 48000, 2)))

#ALH SDW0 Pin3 (ID: 1)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 3, 48000, 2)))

# dmic01 (ID: 1)
DAI_CONFIG(DMIC, 0, 2, dmic01,
Expand Down
16 changes: 11 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 @@ -6,6 +6,7 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`alh.m4')

# Include TLV library
include(`common/tlv.m4')
Expand Down Expand Up @@ -206,21 +207,26 @@ PCM_PLAYBACK_ADD(HDMI3, 7, PIPELINE_PCM_8)

#ALH dai index = ((link_id << 8) | PDI id)
#ALH SDW0 Pin2 (ID: 0)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 2, 48000, 2)))

#ALH SDW0 Pin3 (ID: 1)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 3, 48000, 2)))

#ALH SDW1 Pin2 (ID: 2)
DAI_CONFIG(ALH, 0x102, 2, SDW1-Playback)
DAI_CONFIG(ALH, 0x102, 2, SDW1-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x102, 48000, 2)))

ifdef(`NO_AGGREGATION',
`#ALH SDW2 Pin2 (ID: 3)
DAI_CONFIG(ALH, 0x202, 3, SDW2-Playback)',
DAI_CONFIG(ALH, 0x202, 3, SDW2-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x202, 48000, 2)))',
`')

#ALH SDW3 Pin2 (ID: 4)
DAI_CONFIG(ALH, 0x302, 4, SDW3-Capture)
DAI_CONFIG(ALH, 0x302, 4, SDW3-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x302, 48000, 2)))

# 3 HDMI/DP outputs (ID: 5,6,7)
DAI_CONFIG(HDA, 0, 5, iDisp1)
Expand Down
16 changes: 11 additions & 5 deletions 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 @@ -6,6 +6,7 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`alh.m4')

# Include TLV library
include(`common/tlv.m4')
Expand Down Expand Up @@ -127,18 +128,23 @@ PCM_CAPTURE_ADD(Microphones, 4, PIPELINE_PCM_5)

#ALH dai index = ((link_id << 8) | PDI id)
#ALH SDW0 Pin2 (ID: 0)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 2, 48000, 2)))

#ALH SDW0 Pin3 (ID: 1)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 3, 48000, 2)))

#ALH SDW1 Pin2 (ID: 2)
DAI_CONFIG(ALH, 0x102, 2, SDW1-Playback)
DAI_CONFIG(ALH, 0x102, 2, SDW1-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x102, 48000, 2)))

#ALH SDW2 Pin2 (ID: 3)
DAI_CONFIG(ALH, 0x202, 3, SDW2-Playback)
DAI_CONFIG(ALH, 0x202, 3, SDW2-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x202, 48000, 2)))

#ALH SDW3 Pin2 (ID: 4)
DAI_CONFIG(ALH, 0x302, 4, SDW3-Capture)
DAI_CONFIG(ALH, 0x302, 4, SDW3-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x302, 48000, 2)))

DEBUG_END
7 changes: 5 additions & 2 deletions tools/topology/sof-tgl-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`alh.m4')

# Include TLV library
include(`common/tlv.m4')
Expand Down Expand Up @@ -193,10 +194,12 @@ PCM_PLAYBACK_ADD(HDMI4, 7, PIPELINE_PCM_8)

#ALH dai index = ((link_id << 8) | PDI id)
#ALH SDW0 Pin2 (ID: 0)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 2, 48000, 2)))

#ALH SDW0 Pin3 (ID: 1)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 3, 48000, 2)))

# dmic01 (ID: 2)
DAI_CONFIG(DMIC, 0, 2, dmic01,
Expand Down
7 changes: 5 additions & 2 deletions tools/topology/sof-tgl-rt711-i2s-rt1308.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`ssp.m4')
include(`alh.m4')

# Include TLV library
include(`common/tlv.m4')
Expand Down Expand Up @@ -207,10 +208,12 @@ PCM_PLAYBACK_ADD(HDMI4, 8, PIPELINE_PCM_9)

#ALH dai index = ((link_id << 8) | PDI id)
#ALH SDW0 Pin2 (ID: 0)
DAI_CONFIG(ALH, 0x002, 0, SDW0-Playback)
DAI_CONFIG(ALH, 0x002, 0, SDW0-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x002, 48000, 2)))

#ALH SDW0 Pin3 (ID: 1)
DAI_CONFIG(ALH, 0x003, 1, SDW0-Capture)
DAI_CONFIG(ALH, 0x003, 1, SDW0-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x003, 48000, 2)))

#SSP 2 (ID: 2)
DAI_CONFIG(SSP, 2, 2, SSP2-Codec,
Expand Down
10 changes: 7 additions & 3 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 @@ -6,6 +6,7 @@
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`alh.m4')
include(`platform/intel/dmic.m4')

# Include TLV library
Expand Down Expand Up @@ -189,13 +190,16 @@ PCM_PLAYBACK_ADD(HDMI4, 8, PIPELINE_PCM_9)

#ALH dai index = ((link_id << 8) | PDI id)
#ALH SDW0 Pin2 (ID: 0)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback)
DAI_CONFIG(ALH, 2, 0, SDW0-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 2, 48000, 2)))

#ALH SDW0 Pin3 (ID: 1)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture)
DAI_CONFIG(ALH, 3, 1, SDW0-Capture,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 3, 48000, 2)))

#ALH SDW1 Pin2 (ID: 2)
DAI_CONFIG(ALH, 0x102, 2, SDW1-Playback)
DAI_CONFIG(ALH, 0x102, 2, SDW1-Playback,
ALH_CONFIG(ALH_CONFIG_DATA(ALH, 0x102, 48000, 2)))

# dmic01 (ID: 3)
DAI_CONFIG(DMIC, 0, 3, dmic01,
Expand Down
5 changes: 5 additions & 0 deletions tools/topology/sof/tokens.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,8 @@ SectionVendorTokens."sof_led_tokens" {
SOF_TKN_MUTE_LED_USE "1300"
SOF_TKN_MUTE_LED_DIRECTION "1301"
}

SectionVendorTokens."sof_alh_tokens" {
SOF_TKN_INTEL_ALH_RATE "1400"
SOF_TKN_INTEL_ALH_CH "1401"
}