Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

Commit bd7dc88

Browse files
ranj063lrgirdwo
ranj063
authored and
lrgirdwo
committed
topology: remove DMAC ID/DMAC_CHANNEL from PIPELINE/PCM/DAI definitions
The firmware no longer uses the DMAC ID and channel info from topology. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
1 parent 2cc3ad2 commit bd7dc88

37 files changed

Lines changed: 86 additions & 261 deletions

‎topology/dsps/bdw.m4‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF
2525

2626
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
2727

28-
# DAI0 platform playback configuration
29-
W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"'))
30-
31-
W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
32-
33-
# DAI0 platform capture configuration
34-
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
35-
36-
W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
37-
38-
# PCM platform configuration
39-
W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN'))
40-
41-
W_DATA(pcm_plat_conf, pcm_plat_tokens)
42-
4328
# DAI schedule Configuration - scheduled by IRQ
4429
W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"'))
4530

‎topology/dsps/bxt.m4‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF
2828

2929
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
3030

31-
# DAI0 platform playback configuration
32-
W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"'))
33-
34-
W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
35-
36-
# DAI0 platform capture configuration
37-
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "0"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
38-
39-
W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
40-
41-
# PCM platform configuration
42-
W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN'))
43-
44-
W_DATA(pcm_plat_conf, pcm_plat_tokens)
45-
4631
# DAI schedule Configuration - scheduled by IRQ
4732
W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"'))
4833

‎topology/dsps/byt.m4‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF
2525

2626
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
2727

28-
# DAI0 platform playback configuration
29-
W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"'))
30-
31-
W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
32-
33-
# DAI0 platform capture configuration
34-
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
35-
36-
W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
37-
38-
# PCM platform configuration
39-
W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN'))
40-
41-
W_DATA(pcm_plat_conf, pcm_plat_tokens)
42-
4328
# DAI schedule Configuration - scheduled by IRQ
4429
W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"'))
4530

‎topology/dsps/cht.m4‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF
2525

2626
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
2727

28-
# DAI0 platform playback configuration
29-
W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"'))
30-
31-
W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
32-
33-
# DAI0 platform capture configuration
34-
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
35-
36-
W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
37-
38-
# PCM platform configuration
39-
W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN'))
40-
41-
W_DATA(pcm_plat_conf, pcm_plat_tokens)
42-
4328
# DAI schedule Configuration - scheduled by IRQ
4429
W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"'))
4530

‎topology/dsps/cnl.m4‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF
2929

3030
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
3131

32-
# DAI0 platform playback configuration
33-
W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"'))
34-
35-
W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
36-
37-
# DAI0 platform capture configuration
38-
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
39-
40-
W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
41-
42-
# PCM platform configuration
43-
W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN'))
44-
45-
W_DATA(pcm_plat_conf, pcm_plat_tokens)
46-
4732
# DAI schedule Configuration - scheduled by IRQ
4833
W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"'))
4934

‎topology/dsps/hsw.m4‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@ W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF
2525

2626
W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
2727

28-
# DAI0 platform playback configuration
29-
W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "0"'))
30-
31-
W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
32-
33-
# DAI0 platform capture configuration
34-
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
35-
36-
W_DATA(dai0c_plat_conf, dai0c_plat_tokens)
37-
38-
# PCM platform configuration
39-
W_VENDORTUPLES(pcm_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC PIPELINE_DMAC', `SOF_TKN_DAI_DMAC_CHAN PIPELINE_DMAC_CHAN'))
40-
41-
W_DATA(pcm_plat_conf, pcm_plat_tokens)
42-
4328
# DAI schedule Configuration - scheduled by IRQ
4429
W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(` ', `SOF_TKN_SCHED_MIPS "5000"'))
4530

‎topology/m4/dai.m4‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define(`N_DAI', DAI_NAME)
77
define(`N_DAI_OUT', DAI_NAME`.OUT')
88
define(`N_DAI_IN', DAI_NAME`.IN')
99

10-
dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload, data)
10+
dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload)
1111
define(`W_DAI_OUT',
1212
`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w_comp" {'
1313
` tokens "sof_comp_tokens"'
@@ -57,11 +57,10 @@ define(`W_DAI_OUT',
5757
` "'N_DAI_OUT($2)`_data_w_comp"'
5858
` "'N_DAI_OUT($2)`_data_str"'
5959
` "'N_DAI_OUT($2)`_data_comp_str"'
60-
` "'$8`"'
6160
` ]'
6261
`}')
6362

64-
dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload, data)
63+
dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload)
6564
define(`W_DAI_IN',
6665
`SectionVendorTuples."'N_DAI_IN($2)`_tuples_w_comp" {'
6766
` tokens "sof_comp_tokens"'
@@ -111,7 +110,6 @@ define(`W_DAI_IN',
111110
` "'N_DAI_IN($2)`_data_w_comp"'
112111
` "'N_DAI_IN($2)`_data_str"'
113112
` "'N_DAI_IN($2)`_data_comp_str"'
114-
` "'$8`"'
115113
` ]'
116114
`}')
117115

‎topology/m4/pcm.m4‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,72 +6,50 @@ dnl PCM name)
66
define(`N_PCMP', `PCM'$1`P')
77
define(`N_PCMC', `PCM'$1`C')
88

9-
dnl W_PCM_PLAYBACK(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload)
9+
dnl W_PCM_PLAYBACK(pcm, stream, periods_sink, periods_source, preload)
1010
dnl PCM platform configuration
1111
define(`W_PCM_PLAYBACK',
1212
`SectionVendorTuples."'N_PCMP($1)`_tuples_w_comp" {'
1313
` tokens "sof_comp_tokens"'
1414
` tuples."word" {'
15-
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5)
16-
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6)
17-
` SOF_TKN_COMP_PRELOAD_COUNT' STR($7)
15+
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3)
16+
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4)
17+
` SOF_TKN_COMP_PRELOAD_COUNT' STR($5)
1818
` }'
1919
`}'
2020
`SectionData."'N_PCMP($1)`_data_w_comp" {'
2121
` tuples "'N_PCMP($1)`_tuples_w_comp"'
2222
`}'
23-
`SectionVendorTuples."'N_PCMP($1)`_tuples" {'
24-
` tokens "sof_pcm_tokens"'
25-
` tuples."word" {'
26-
` SOF_TKN_PCM_DMAC' STR($3)
27-
` SOF_TKN_PCM_DMAC_CHAN' STR($4)
28-
` }'
29-
`}'
30-
`SectionData."'N_PCMP($1)`_data" {'
31-
` tuples "'N_PCMP($1)`_tuples"'
32-
`}'
3323
`SectionWidget."'N_PCMP($1)`" {'
3424
` index "'PIPELINE_ID`"'
3525
` type "aif_in"'
3626
` no_pm "true"'
3727
` stream_name "'$2` '$1`"'
3828
` data ['
39-
` "'N_PCMP($1)`_data"'
4029
` "'N_PCMP($1)`_data_w_comp"'
4130
` ]'
4231
`}')
4332

4433

45-
dnl W_PCM_CAPTURE(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload)
34+
dnl W_PCM_CAPTURE(pcm, stream, periods_sink, periods_source, preload)
4635
define(`W_PCM_CAPTURE',
4736
`SectionVendorTuples."'N_PCMC($1)`_tuples_w_comp" {'
4837
` tokens "sof_comp_tokens"'
4938
` tuples."word" {'
50-
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5)
51-
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6)
52-
` SOF_TKN_COMP_PRELOAD_COUNT' STR($7)
39+
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3)
40+
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4)
41+
` SOF_TKN_COMP_PRELOAD_COUNT' STR($5)
5342
` }'
5443
`}'
5544
`SectionData."'N_PCMC($1)`_data_w_comp" {'
5645
` tuples "'N_PCMC($1)`_tuples_w_comp"'
5746
`}'
58-
`SectionVendorTuples."'N_PCMC($1)`_tuples" {'
59-
` tokens "sof_pcm_tokens"'
60-
` tuples."word" {'
61-
` SOF_TKN_PCM_DMAC' STR($3)
62-
` SOF_TKN_PCM_DMAC_CHAN' STR($4)
63-
` }'
64-
`}'
65-
`SectionData."'N_PCMC($1)`_data" {'
66-
` tuples "'N_PCMC($1)`_tuples"'
67-
`}'
6847
`SectionWidget."'N_PCMC($1)`" {'
6948
` index "'PIPELINE_ID`"'
7049
` type "aif_out"'
7150
` no_pm "true"'
7251
` stream_name "'$2` '$1`"'
7352
` data ['
74-
` "'N_PCMC($1)`_data"'
7553
` "'N_PCMC($1)`_data_w_comp"'
7654
` ]'
7755
`}')

‎topology/m4/pipeline.m4‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ define(`W_PIPELINE',
3333

3434
dnl PIPELINE_PCM_ADD(pipeline,
3535
dnl pipe id, pcm, max channels, format,
36-
dnl frames, deadline, priority, core, dmac, dmac_chan)
36+
dnl frames, deadline, priority, core)
3737
define(`PIPELINE_PCM_ADD',
3838
`undefine(`PCM_ID')'
3939
`undefine(`PIPELINE_ID')'
@@ -43,8 +43,6 @@ define(`PIPELINE_PCM_ADD',
4343
`undefine(`SCHEDULE_DEADLINE')'
4444
`undefine(`SCHEDULE_PRIORITY')'
4545
`undefine(`SCHEDULE_CORE')'
46-
`undefine(`PIPELINE_DMAC')'
47-
`undefine(`PIPELINE_DMAC_CHAN')'
4846
`define(`PIPELINE_ID', $2)'
4947
`define(`PCM_ID', $3)'
5048
`define(`PIPELINE_CHANNELS', $4)'
@@ -53,14 +51,12 @@ define(`PIPELINE_PCM_ADD',
5351
`define(`SCHEDULE_DEADLINE', $7)'
5452
`define(`SCHEDULE_PRIORITY', $8)'
5553
`define(`SCHEDULE_CORE', $9)'
56-
`define(`PIPELINE_DMAC', $10)'
57-
`define(`PIPELINE_DMAC_CHAN', $11)'
5854
`include($1)'
5955
)
6056

6157
dnl PIPELINE_PCM_DAI_ADD(pipeline,
6258
dnl pipe id, pcm, max channels, format,
63-
dnl frames, deadline, priority, core, dmac, dmac_chan,
59+
dnl frames, deadline, priority, core,
6460
dnl dai type, dai_index, dai format, periods)
6561
define(`PIPELINE_PCM_DAI_ADD',
6662
`undefine(`PCM_ID')'
@@ -71,8 +67,6 @@ define(`PIPELINE_PCM_DAI_ADD',
7167
`undefine(`SCHEDULE_DEADLINE')'
7268
`undefine(`SCHEDULE_PRIORITY')'
7369
`undefine(`SCHEDULE_CORE')'
74-
`undefine(`PIPELINE_DMAC')'
75-
`undefine(`PIPELINE_DMAC_CHAN')'
7670
`undefine(`DAI_TYPE')'
7771
`undefine(`DAI_INDEX')'
7872
`undefine(`DAI_FORMAT')'
@@ -85,13 +79,11 @@ define(`PIPELINE_PCM_DAI_ADD',
8579
`define(`SCHEDULE_DEADLINE', $7)'
8680
`define(`SCHEDULE_PRIORITY', $8)'
8781
`define(`SCHEDULE_CORE', $9)'
88-
`define(`PIPELINE_DMAC', $10)'
89-
`define(`PIPELINE_DMAC_CHAN', $11)'
90-
`define(`DAI_TYPE', STR($12))'
91-
`define(`DAI_INDEX', STR($13))'
92-
`define(`DAI_FORMAT', $14)'
93-
`define(`DAI_PERIODS', $15)'
94-
`define(`DAI_NAME', $12$13)'
82+
`define(`DAI_TYPE', STR($10))'
83+
`define(`DAI_INDEX', STR($11))'
84+
`define(`DAI_FORMAT', $12)'
85+
`define(`DAI_PERIODS', $13)'
86+
`define(`DAI_NAME', $10$11)'
9587
`include($1)'
9688
)
9789

‎topology/sof-apl-nocodec.m4‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,21 @@ include(`dsps/bxt.m4')
3030

3131
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
3232
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
33-
# Use DMAC 0 channel 1 for PCM audio playback data
3433
PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
3534
1, 0, 2, s32le,
36-
48, 1000, 0, 0, 0, 1)
35+
48, 1000, 0, 0)
3736

3837
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
3938
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
40-
# Use DMAC 0 channel 2 for PCM audio capture data
4139
PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
4240
2, 0, 2, s32le,
43-
48, 1000, 0, 0, 0, 2)
41+
48, 1000, 0, 0)
4442

4543
# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
4644
# Schedule 96 frames per 2000us deadline on core 0 with priority 1
47-
# Use DMAC 0 channel 3 for PCM audio playback data
4845
PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
4946
3, 1, 2, s32le,
50-
96, 2000, 1, 0, 0, 3)
47+
96, 2000, 1, 0)
5148

5249
# Tone Playback pipeline 5 using max 2 channels of s32le.
5350
# Schedule 192 frames per 4000us deadline on core 0 with priority 2

0 commit comments

Comments
 (0)