Skip to content

Commit efba69e

Browse files
Srinivas-KandagatlaSrinivas-Kandagatla
authored
Merge branch 'main' into radxa-dragon-q6a
Signed-off-by: Srini <[email protected]>
2 parents 8225227 + b10784a commit efba69e

File tree

3 files changed

+145
-1
lines changed

3 files changed

+145
-1
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ set(TPLGS
2525
"X1E80100-LENOVO-Thinkpad-T14s\;X1E80100-TUXEDO-Elite-14\;qcom/x1e80100\;"
2626
"X1E80100-LENOVO-Thinkpad-T14s\;X1E80100-Romulus\;qcom/x1e80100\;"
2727
"X1E80100-LENOVO-Yoga-Slim7x\;X1E80100-LENOVO-Yoga-Slim7x\;qcom/x1e80100/LENOVO/83ED\;"
28+
"QCM6490-IDP\;qcm6490-idp-snd-card\;qcom/qcm6490/qcm6490-idp\;"
2829
"QCS6490-Radxa-Dragon-Q6A\;QCS6490-Radxa-Dragon-Q6A\;qcom/qcs6490/radxa/dragon-q6a\;"
29-
)
30+
"QCS6490-RB3Gen2\;qcs6490-rb3gen2-snd-card\;qcom/qcs6490/qcs6490-rb3gen2\;"
31+
)
3032

3133
add_custom_target(topologies ALL)
3234

‎QCM6490-IDP.m4‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Copyright, Linaro Ltd, 2023
2+
# SPDX-License-Identifier: BSD-3-Clause
3+
include(`audioreach/audioreach.m4')
4+
include(`audioreach/stream-subgraph.m4')
5+
include(`audioreach/device-subgraph.m4')
6+
include(`util/route.m4')
7+
include(`util/mixer.m4')
8+
include(`audioreach/tokens.m4')
9+
#
10+
# Stream SubGraph for MultiMedia Playback
11+
#
12+
# ______________________________________________
13+
# | Sub Graph 1 |
14+
# | [WR_SH] -> [PCM DEC] -> [PCM CONV] -> [LOG] |- Kcontrol
15+
# |______________________________________________|
16+
#
17+
dnl Playback MultiMedia1
18+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA1,
19+
`S16_LE', 48000, 48000, 2, 2,
20+
0x00004001, 0x00004001, 0x00006001, `110000')
21+
dnl
22+
dnl Capture MultiMedia2
23+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA2,
24+
`S16_LE', 48000, 48000, 1, 4,
25+
0x00004002, 0x00004002, 0x00006020, `110000')
26+
dnl
27+
dnl Playback MultiMedia3
28+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA3,
29+
`S16_LE', 48000, 48000, 2, 2,
30+
0x00004003, 0x00004003, 0x00006040, `110000')
31+
dnl
32+
dnl Capture MultiMedia4
33+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA4,
34+
`S16_LE', 48000, 48000, 1, 2,
35+
0x00004004, 0x00004004, 0x00006050, `110000')
36+
dnl
37+
#
38+
#
39+
# Device SubGraph for WSA RX0 Backend
40+
#
41+
# ___________________
42+
# | Sub Graph 2 |
43+
# Mixer -| [LOG] -> [WSA EP] |
44+
# |___________________|
45+
#
46+
dnl DEVICE_SG_ADD(stream, stream-dai-id, stream-index,
47+
dnl format, min-rate, max-rate, min-channels, max-channels,
48+
dnl interface-type, interface-index, data-format,
49+
dnl sg-iid-start, cont-iid-start, mod-iid-start
50+
dnl WSA Playback
51+
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `WSA_CODEC_DMA_RX_0', WSA_CODEC_DMA_RX_0,
52+
`S16_LE', 48000, 48000, 2, 2,
53+
LPAIF_INTF_TYPE_WSA, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT,
54+
0x00004005, 0x00004005, 0x00006060)
55+
dnl
56+
dnl VA Capture
57+
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_0', VA_CODEC_DMA_TX_0,
58+
`S16_LE', 48000, 48000, 1, 4,
59+
LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT,
60+
0x00004006, 0x00004006, 0x00006080)
61+
dnl
62+
dnl WCDRX Playback
63+
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `RX_CODEC_DMA_RX_0', RX_CODEC_DMA_RX_0,
64+
`S16_LE', 48000, 48000, 2, 2,
65+
LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT,
66+
0x00004007, 0x00004007, 0x00006110)
67+
dnl
68+
dnl WCDTX Capture
69+
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `TX_CODEC_DMA_TX_3', TX_CODEC_DMA_TX_3,
70+
`S16_LE', 48000, 48000, 1, 2,
71+
LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_TX3, 0, DATA_FORMAT_FIXED_POINT,
72+
0x00004008, 0x00004008, 0x00006130)
73+
dnl
74+
75+
STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'')
76+
STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia3'')
77+
STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'')
78+
STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia3, stream1.logger1'')
79+
80+
dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
81+
STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA2, ``VA_CODEC_DMA_TX_0'')
82+
STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA4, ``TX_CODEC_DMA_TX_3'' )
83+
dnl STREAM_DEVICE_CAPTURE_ROUTE(stream-index, mixer-name, route1, route2.. routeN)
84+
STREAM_DEVICE_CAPTURE_ROUTE(FRONTEND_DAI_MULTIMEDIA2, ``MultiMedia2 Mixer'', ``VA_CODEC_DMA_TX_0, device110.logger1'')
85+
STREAM_DEVICE_CAPTURE_ROUTE(FRONTEND_DAI_MULTIMEDIA4, ``MultiMedia4 Mixer'', ``TX_CODEC_DMA_TX_3, device120.logger1'')

‎QCS6490-RB3Gen2.m4‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Copyright, Linaro Ltd, 2023
2+
# SPDX-License-Identifier: BSD-3-Clause
3+
include(`audioreach/audioreach.m4')
4+
include(`audioreach/stream-subgraph.m4')
5+
include(`audioreach/device-subgraph.m4')
6+
include(`util/route.m4')
7+
include(`util/mixer.m4')
8+
include(`audioreach/tokens.m4')
9+
#
10+
# Stream SubGraph for MultiMedia Playback
11+
#
12+
# ______________________________________________
13+
# | Sub Graph 1 |
14+
# | [WR_SH] -> [PCM DEC] -> [PCM CONV] -> [LOG] |- Kcontrol
15+
# |______________________________________________|
16+
#
17+
dnl Playback MultiMedia1
18+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA1,
19+
`S16_LE', 48000, 48000, 2, 2,
20+
0x00004001, 0x00004001, 0x00006001, `110000')
21+
dnl Capture MultiMedia2
22+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA2,
23+
`S16_LE', 48000, 48000, 1, 2,
24+
0x00004003, 0x00004003, 0x00006020, `110000')
25+
#
26+
#
27+
# Device SubGraph for WSA RX0 Backend
28+
#
29+
# ___________________
30+
# | Sub Graph 2 |
31+
# Mixer -| [LOG] -> [WSA EP] |
32+
# |___________________|
33+
#
34+
dnl DEVICE_SG_ADD(stream, stream-dai-id, stream-index,
35+
dnl format, min-rate, max-rate, min-channels, max-channels,
36+
dnl interface-type, interface-index, data-format,
37+
dnl sg-iid-start, cont-iid-start, mod-iid-start
38+
dnl WSA Playback
39+
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `WSA_CODEC_DMA_RX_0', WSA_CODEC_DMA_RX_0,
40+
`S16_LE', 48000, 48000, 2, 2,
41+
LPAIF_INTF_TYPE_WSA, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT,
42+
0x00004005, 0x00004005, 0x00006050)
43+
dnl
44+
dnl VA Capture
45+
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_0', VA_CODEC_DMA_TX_0,
46+
`S16_LE', 48000, 48000, 1, 2,
47+
LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT,
48+
0x00004008, 0x00004008, 0x00006080)
49+
dnl
50+
51+
STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'')
52+
STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'')
53+
54+
dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
55+
STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA2, ``VA_CODEC_DMA_TX_0'')
56+
dnl STREAM_DEVICE_CAPTURE_ROUTE(stream-index, mixer-name, route1, route2.. routeN)
57+
STREAM_DEVICE_CAPTURE_ROUTE(FRONTEND_DAI_MULTIMEDIA2, ``MultiMedia2 Mixer'', ``VA_CODEC_DMA_TX_0, device110.logger1'')

0 commit comments

Comments
 (0)