Skip to content

Commit 8911ae4

Browse files
audioreach: qcs6490: update topology for QCS6490-RB3Gen2 (#40)
update topology to support HDMI and DP audio playback. Signed-off-by: karthik.s <karthik.s@oss.qualcomm.com> Co-authored-by: Srinivas Kandagatla <srini@kernel.org>
1 parent 2c72b61 commit 8911ae4

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

QCS6490-RB3Gen2.m4

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ dnl Capture MultiMedia2
2222
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA2,
2323
`S16_LE', 48000, 48000, 1, 2,
2424
0x00004003, 0x00004003, 0x00006020, `110000')
25+
dnl Playback MultiMedia3
26+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA3,
27+
`S32_LE', 48000, 48000, 2, 2,
28+
0x00004004, 0x00004004, 0x00006030, `110000')
29+
dnl Playback MultiMedia3
30+
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA4,
31+
`S16_LE', 48000, 48000, 2, 2,
32+
0x00004002, 0x00004002, 0x00006010, `110000')
2533
#
2634
#
2735
# Device SubGraph for WSA RX0 Backend
@@ -41,16 +49,34 @@ DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `WSA_CODEC_DMA_R
4149
LPAIF_INTF_TYPE_WSA, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT,
4250
0x00004005, 0x00004005, 0x00006050)
4351
dnl
52+
dnl Secondary MI2S Playback
53+
DEVICE_SG_ADD(audioreach/subgraph-device-i2s-playback.m4, `Secondary', SECONDARY_MI2S_RX,
54+
`S32_LE', 48000, 48000, 2, 2,
55+
LPAIF_INTF_TYPE_LPAIF, I2S_INTF_TYPE_SECONDARY, SD_LINE_IDX_I2S_SD0, DATA_FORMAT_FIXED_POINT,
56+
0x00004006, 0x00004006, 0x00006060, `SECONDARY_MI2S_RX')
57+
dnl
4458
dnl VA Capture
4559
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_0', VA_CODEC_DMA_TX_0,
4660
`S16_LE', 48000, 48000, 1, 2,
4761
LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT,
4862
0x00004008, 0x00004008, 0x00006080)
4963
dnl
64+
dnl Display port0 Playback
65+
DEVICE_SG_ADD(audioreach/subgraph-device-display-port-playback.m4, `DISPLAY_PORT_RX_0', DISPLAY_PORT_RX_0,
66+
`S16_LE', 48000, 48000, 2, 2,
67+
0, 0, 0, DATA_FORMAT_FIXED_POINT,
68+
0x00004012, 0x00004012, 0x00006120, `DISPLAY_PORT_RX_0')
69+
dnl
5070

5171
STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'')
5272
STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'')
5373

74+
STREAM_DEVICE_PLAYBACK_MIXER(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX'', ``MultiMedia3'')
75+
STREAM_DEVICE_PLAYBACK_ROUTE(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX Audio Mixer'', ``MultiMedia3, stream2.logger1'')
76+
77+
STREAM_DEVICE_PLAYBACK_MIXER(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0'', ``MultiMedia4'')
78+
STREAM_DEVICE_PLAYBACK_ROUTE(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0 Audio Mixer'', ``MultiMedia4, stream3.logger1'')
79+
5480
dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
5581
STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA2, ``VA_CODEC_DMA_TX_0'')
5682
dnl STREAM_DEVICE_CAPTURE_ROUTE(stream-index, mixer-name, route1, route2.. routeN)

0 commit comments

Comments
 (0)