From 23dca19204aab5ab1d5bf9d0a035d817b0db6542 Mon Sep 17 00:00:00 2001 From: Aleksandrs Vinarskis Date: Thu, 10 Apr 2025 21:19:26 +0200 Subject: [PATCH 1/2] x1e80100: cleanup Lenovo Yoga Slim7x Since this device does not have a headphone jack, it does not have WCD codec, as also confirmed by device-tree. Drop leftover MultiMedia1, MultiMedia3 DAIs to fix dmesg errors in Alsa. Signed-off-by: Aleksandrs Vinarskis --- X1E80100-LENOVO-Yoga-Slim7x.m4 | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/X1E80100-LENOVO-Yoga-Slim7x.m4 b/X1E80100-LENOVO-Yoga-Slim7x.m4 index d69162c..fbf90b7 100644 --- a/X1E80100-LENOVO-Yoga-Slim7x.m4 +++ b/X1E80100-LENOVO-Yoga-Slim7x.m4 @@ -14,18 +14,10 @@ include(`audioreach/tokens.m4') # | [WR_SH] -> [PCM DEC] -> [PCM CONV] -> [LOG] |- Kcontrol # |______________________________________________| # -dnl Playback MultiMedia1 -STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA1, - `S16_LE', 48000, 48000, 2, 4, - 0x00004001, 0x00004001, 0x00006001, `110000') dnl Playback MultiMedia2 STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA2, `S16_LE', 48000, 48000, 2, 4, 0x00004002, 0x00004002, 0x00006010, `110000') -dnl Capture MultiMedia3 -STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA3, - `S16_LE', 48000, 48000, 1, 2, - 0x00004003, 0x00004003, 0x00006020, `110000') dnl Capture MultiMedia4 STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA4, `S16_LE', 48000, 48000, 1, 2, @@ -55,13 +47,11 @@ DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_ LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT, 0x00004018, 0x00004018, 0x00006180) -STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'') +STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``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(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``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'' ) STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA4, ``VA_CODEC_DMA_TX_0'' ) dnl STREAM_DEVICE_CAPTURE_ROUTE(stream-index, mixer-name, route1, route2.. routeN) -STREAM_DEVICE_CAPTURE_ROUTE(FRONTEND_DAI_MULTIMEDIA3, ``MultiMedia3 Mixer'', ``VA_CODEC_DMA_TX_0, device110.logger1'') STREAM_DEVICE_CAPTURE_ROUTE(FRONTEND_DAI_MULTIMEDIA4, ``MultiMedia4 Mixer'', ``VA_CODEC_DMA_TX_0, device110.logger1'') From 9fb2fd2c620103b36123bd6b6ae3eb247d6fb9d2 Mon Sep 17 00:00:00 2001 From: Aleksandrs Vinarskis Date: Thu, 10 Apr 2025 21:24:25 +0200 Subject: [PATCH 2/2] x1e80100: fix MIC count on Lenovo Yoga Slim7x Device has 4 DMICs, as also evident from the definition of Sub Graph. Signed-off-by: Aleksandrs Vinarskis --- X1E80100-LENOVO-Yoga-Slim7x.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X1E80100-LENOVO-Yoga-Slim7x.m4 b/X1E80100-LENOVO-Yoga-Slim7x.m4 index fbf90b7..fc9328e 100644 --- a/X1E80100-LENOVO-Yoga-Slim7x.m4 +++ b/X1E80100-LENOVO-Yoga-Slim7x.m4 @@ -20,7 +20,7 @@ STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTI 0x00004002, 0x00004002, 0x00006010, `110000') dnl Capture MultiMedia4 STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA4, - `S16_LE', 48000, 48000, 1, 2, + `S16_LE', 48000, 48000, 1, 4, 0x00004004, 0x00004004, 0x00006030, `110000') # #