From a66506fb5d1335e889da847d74cd11f42c174bbf Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Tue, 9 May 2023 12:07:15 +0100 Subject: [PATCH] audioreach: sc8280xp: add display port support Signed-off-by: Srinivas Kandagatla (cherry picked from commit 15e29f8df5699e72c770cd068ee17606ccecd261) Signed-off-by: Krzysztof Kozlowski --- SC8280XP-LENOVO-X13S.m4 | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/SC8280XP-LENOVO-X13S.m4 b/SC8280XP-LENOVO-X13S.m4 index 6b7fbfd..2680fb8 100644 --- a/SC8280XP-LENOVO-X13S.m4 +++ b/SC8280XP-LENOVO-X13S.m4 @@ -22,6 +22,7 @@ dnl Playback MultiMedia2 STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA2, `S16_LE', 48000, 48000, 2, 2, 0x00004002, 0x00004002, 0x00006010) + dnl Capture MultiMedia3 STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA3, `S16_LE', 48000, 48000, 1, 2, @@ -47,31 +48,46 @@ dnl WSA Playback DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `WSA_CODEC_DMA_RX_0', WSA_CODEC_DMA_RX_0, `S16_LE', 48000, 48000, 2, 2, LPAIF_INTF_TYPE_WSA, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT, - 0x00004005, 0x00004005, 0x00006050) + 0x00004010, 0x00004010, 0x00006100) dnl dnl WCDRX Playback DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `RX_CODEC_DMA_RX_0', RX_CODEC_DMA_RX_0, - `S16_LE', 48000, 48000, 2, 2, + `S16_LE', 48000, 48000, 2, 2, LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT, - 0x00004007, 0x00004007, 0x00006070) + 0x00004011, 0x00004011, 0x00006110) dnl +dnl Display port0 Playback +DEVICE_SG_ADD(audioreach/subgraph-device-display-port-playback.m4, `DISPLAY_PORT_RX_0', DISPLAY_PORT_RX_0, + `S16_LE', 48000, 48000, 2, 2, + 0, 0, 0, DATA_FORMAT_FIXED_POINT, + 0x00004012, 0x00004012, 0x00006120, `DISPLAY_PORT_RX_0') +dnl +dnl Display port1 Playback +DEVICE_SG_ADD(audioreach/subgraph-device-display-port-playback.m4, `DISPLAY_PORT_RX_1', DISPLAY_PORT_RX_1, + `S16_LE', 48000, 48000, 2, 2, + 0, 0, 0, DATA_FORMAT_FIXED_POINT, + 0x00004013, 0x00004013, 0x00006130, `DISPLAY_PORT_RX_1') dnl VA Capture DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_0', VA_CODEC_DMA_TX_0, `S16_LE', 48000, 48000, 1, 2, LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT, - 0x00004008, 0x00004008, 0x00006080) + 0x00004015, 0x00004015, 0x00006150) dnl dnl WCDTX Capture DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `TX_CODEC_DMA_TX_3', TX_CODEC_DMA_TX_3, `S16_LE', 48000, 48000, 1, 2, LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_TX3, 0, DATA_FORMAT_FIXED_POINT, - 0x00004009, 0x00004009, 0x00006090) + 0x00004016, 0x00004016, 0x00006160) STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'') STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'') +STREAM_DEVICE_PLAYBACK_MIXER(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0'', ``MultiMedia1'', ``MultiMedia2'') +STREAM_DEVICE_PLAYBACK_MIXER(DISPLAY_PORT_RX_1, ``DISPLAY_PORT_RX_1'', ``MultiMedia1'', ``MultiMedia2'') STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'') STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'') +STREAM_DEVICE_PLAYBACK_ROUTE(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'') +STREAM_DEVICE_PLAYBACK_ROUTE(DISPLAY_PORT_RX_1, ``DISPLAY_PORT_RX_1 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'') dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN) STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'',``TX_CODEC_DMA_TX_3'' )