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

Commit 765d9d9

Browse files
xiulipanxiulipan
committed
topology: add SSP_BESOPEN_CONFIG for SSP DAIs
Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
1 parent f23f302 commit 765d9d9

20 files changed

+37
-31
lines changed

‎topology/m4/dai.m4‎

Lines changed: 6 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)
10+
dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload, bespoken)
1111
define(`W_DAI_OUT',
1212
`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w_comp" {'
1313
` tokens "sof_comp_tokens"'
@@ -23,7 +23,8 @@ define(`W_DAI_OUT',
2323
`SectionVendorTuples."'N_DAI_OUT($2)`_tuples_w" {'
2424
` tokens "sof_dai_tokens"'
2525
` tuples."word" {'
26-
` SOF_TKN_DAI_INDEX' $2
26+
` SOF_TKN_DAI_INDEX' $2
27+
` SOF_TKN_DAI_BESPOKEN_CONFIG' ifelse($8, `', "0", $8)
2728
` }'
2829
`}'
2930
`SectionData."'N_DAI_OUT($2)`_data_w" {'
@@ -159,8 +160,8 @@ define(`DAI_CONFIG',
159160

160161
dnl DAI_ADD(pipeline,
161162
dnl pipe id, dai type, dai_index, dai_be,
162-
dnl buffer, periods, format,
163-
dnl frames, deadline, priority, core)
163+
dnl buffer, periods, format,frames, deadline,
164+
dnl priority, core, bespoken_config)
164165
define(`DAI_ADD',
165166
`undefine(`PIPELINE_ID')'
166167
`undefine(`DAI_TYPE')'
@@ -185,6 +186,7 @@ define(`DAI_ADD',
185186
`define(`SCHEDULE_DEADLINE', $10)'
186187
`define(`SCHEDULE_PRIORITY', $11)'
187188
`define(`SCHEDULE_CORE', $12)'
189+
`define(`DAI_BESPOKEN_CONFIG', $13)'
188190
`include($1)'
189191
)
190192

‎topology/platform/common/ssp.m4‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@ define(`SSP_CONFIG_DATA',
4343
`}'
4444
)
4545

46+
dnl SSP dai have loopback mode so set the SSP_BESPOKEN to 1
47+
48+
define(`SSP_BESPOKEN_CONFIG', 1)
49+
4650
divert(0)dnl

‎topology/sof-apl-nocodec.m4‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
116116
DAI_ADD(sof/pipe-dai-playback.m4,
117117
1, SSP, 0, NoCodec-0,
118118
PIPELINE_SOURCE_1, 2, s16le,
119-
48, 1000, 0, 0)
119+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
120120

121121
# capture DAI is SSP0 using 2 periods
122122
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
@@ -130,7 +130,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
130130
DAI_ADD(sof/pipe-dai-playback.m4,
131131
3, SSP, 1, NoCodec-1,
132132
PIPELINE_SOURCE_3, 2, s16le,
133-
48, 1000, 0, 0)
133+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
134134

135135
# capture DAI is SSP1 using 2 periods
136136
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
@@ -144,7 +144,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
144144
DAI_ADD(sof/pipe-dai-playback.m4,
145145
5, SSP, 2, NoCodec-2,
146146
PIPELINE_SOURCE_5, 2, s16le,
147-
48, 1000, 0, 0)
147+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
148148

149149
# capture DAI is SSP2 using 2 periods
150150
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
@@ -158,7 +158,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
158158
DAI_ADD(sof/pipe-dai-playback.m4,
159159
7, SSP, 3, NoCodec-3,
160160
PIPELINE_SOURCE_7, 2, s16le,
161-
48, 1000, 0, 0)
161+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
162162

163163
# capture DAI is SSP3 using 2 periods
164164
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
@@ -172,7 +172,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
172172
#DAI_ADD(sof/pipe-dai-playback.m4,
173173
# 9, SSP, 4, NoCodec,
174174
# PIPELINE_SOURCE_9, 2, s16le,
175-
# 48, 1000, 0, 0)
175+
# 48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
176176

177177
# capture DAI is SSP4 using 2 periods
178178
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
@@ -186,7 +186,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
186186
#DAI_ADD(sof/pipe-dai-playback.m4,
187187
# 11, SSP, 5, NoCodec,
188188
# PIPELINE_SOURCE_11, 2, s16le,
189-
# 48, 1000, 0, 0)
189+
# 48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
190190

191191
# capture DAI is SSP5 using 2 periods
192192
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0

‎topology/sof-apl-pcm512x.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
6161
DAI_ADD(sof/pipe-dai-playback.m4,
6262
2, SSP, 5, SSP5-Codec,
6363
PIPELINE_SOURCE_2, 2, s16le,
64-
48, 1000, 0, 0)
64+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
6565

6666
# capture DAI is SSP5 using 2 periods
6767
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0

‎topology/sof-apl-tdf8532.m4‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
102102
DAI_ADD(sof/pipe-dai-playback.m4,
103103
4, SSP, 0, SSP0-Codec,
104104
PIPELINE_SOURCE_4, 2, s16le,
105-
48, 1000, 0, 0)
105+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
106106

107107
# capture DAI is SSP0 using 2 periods
108108
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
@@ -123,7 +123,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
123123
DAI_ADD(sof/pipe-dai-playback.m4,
124124
2, SSP, 2, SSP2-Codec,
125125
PIPELINE_SOURCE_2, 2, s32le,
126-
48, 1000, 0, 0)
126+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
127127

128128
# capture DAI is SSP2 using 2 periods
129129
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
@@ -137,7 +137,7 @@ DAI_ADD(sof/pipe-dai-capture.m4,
137137
DAI_ADD(sof/pipe-dai-playback.m4,
138138
7, SSP, 3, SSP3-Codec,
139139
PIPELINE_SOURCE_7, 2, s16le,
140-
48, 1000, 0, 0)
140+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
141141

142142
# capture DAI is SSP3 using 2 periods
143143
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
@@ -151,14 +151,14 @@ DAI_ADD(sof/pipe-dai-capture.m4,
151151
DAI_ADD(sof/pipe-dai-playback.m4,
152152
1, SSP, 4, SSP4-Codec,
153153
PIPELINE_SOURCE_1, 2, s32le,
154-
48, 1000, 0, 0)
154+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
155155

156156
# playback DAI is SSP5 using 2 periods
157157
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
158158
DAI_ADD(sof/pipe-dai-playback.m4,
159159
9, SSP, 5, SSP5-Codec,
160160
PIPELINE_SOURCE_9, 2, s16le,
161-
48, 1000, 0, 0)
161+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
162162

163163
# capture DAI is SSP5 using 2 periods
164164
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0

‎topology/sof-bdw-rt286.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ SectionGraph."pipe-bdw-rt286" {
7676
DAI_ADD(sof/pipe-dai-playback.m4,
7777
1, SSP, 0, Codec,
7878
PIPELINE_SOURCE_1, 2, s24le,
79-
48, 1000, 0, 0)
79+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
8080

8181
# capture DAI is SSP0 using 2 periods
8282
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0

‎topology/sof-bdw-rt5640.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ SectionGraph."pipe-bdw-rt5640" {
7676
DAI_ADD(sof/pipe-dai-playback.m4,
7777
1, SSP, 0, Codec,
7878
PIPELINE_SOURCE_1, 2, s24le,
79-
48, 1000, 0, 0)
79+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
8080

8181
# capture DAI is SSP0 using 2 periods
8282
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0

‎topology/sof-byt-da7213.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ SectionGraph."pipe-byt-da7212" {
7676
DAI_ADD(sof/pipe-dai-playback.m4,
7777
1, SSP, 2, SSP2-Codec,
7878
PIPELINE_SOURCE_1, 2, s24le,
79-
48, 1000, 0, 0)
79+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
8080

8181
# capture DAI is SSP2 using 2 periods
8282
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0

‎topology/sof-byt-nocodec.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ SectionGraph."pipe-byt-nocodec" {
7676
DAI_ADD(sof/pipe-dai-playback.m4,
7777
1, SSP, 2, NoCodec-2,
7878
PIPELINE_SOURCE_1, 2, s24le,
79-
48, 1000, 0, 0)
79+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
8080

8181
# capture DAI is SSP2 using 2 periods
8282
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0

‎topology/sof-byt-rt5640.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ SectionGraph."pipe-byt-rt5640" {
7676
DAI_ADD(sof/pipe-dai-playback.m4,
7777
1, SSP, 2, SSP2-Codec,
7878
PIPELINE_SOURCE_1, 2, s24le,
79-
48, 1000, 0, 0)
79+
48, 1000, 0, 0, SSP_BESPOKEN_CONFIG)
8080

8181
# capture DAI is SSP2 using 2 periods
8282
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0

0 commit comments

Comments
 (0)