From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B80AE421A19 for ; Mon, 29 Jun 2026 14:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742619; cv=none; b=iWQRpZqxF7i0xa5lV0GWpKbGeTHlSuZWtcZXc5HgmNg18+AgNLCRa++DZ0FAectFwMovKYWU7tL/fZ5d148hHCmH3dd9rMWPKmXDDi/RwW/x96sRAKJ8uMP9AYHiD7MvSUZEcoBMugPwmd+izmBt5Eb4bDqgx6xCEi3pocxVmOs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742619; c=relaxed/simple; bh=fUvFc3fENqrCdtYGcnwIQZGyeEr3x3tj/FL3fDKbygo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=asijoEaCCsufNlIZzvX/924vRTRF5gWNrvVuht3rGRLUrSgE9Ry5KOR3Po+VidfLpad3e9xqmnLgO3tMh5mYDLBLC6f+DlTRqwxYh4z5n8KYhJTZCHscVk098BCt2amDci/jyQfLovLpSb+tZX3xl5fMisqjEmeYUTymEuAXtTo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=lbn+4ocR; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GHQefGer; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="lbn+4ocR"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GHQefGer" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TASxio2641491 for ; Mon, 29 Jun 2026 14:16:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 3SjUvXL/mX56mOYrPBguEs1h3doPmK8H6vkztD3URlg=; b=lbn+4ocRVkoZVnNE yD8zRV04Vo2axT6kVqEI4NsRhqHaqVpNwKgncF89EcNsy3miEGchJpJMVXaEzKwi R5UgEaruRUnjJ1iyHH8Atx8poYrHKtunNdqTc3RAwNIKq5F+iSdG6deAbkMk4PON SGwLM9tZO4chqQEnPPMXpbExYUc01vLxImzSdgldO45CV/KGJF+RvbbVFw9Bgzo7 QZQT3kvwsce4c42qv/rpTTQRUdM2HqCE7likLCqpDP74BDr12pkxl76QPkzkn0B1 GNLmH9KlPBoTkGmz6SC5AtIU8sr+pPzsZcrErlLvIHWdR8lbS/Vj3e6KDpfzGgzt zoucNQ== Received: from mail-oo1-f72.google.com (mail-oo1-f72.google.com [209.85.161.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3npes76a-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:16:56 +0000 (GMT) Received: by mail-oo1-f72.google.com with SMTP id 006d021491bc7-6a0e7f59833so3805781eaf.0 for ; Mon, 29 Jun 2026 07:16:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782742616; x=1783347416; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3SjUvXL/mX56mOYrPBguEs1h3doPmK8H6vkztD3URlg=; b=GHQefGeragr51ir4quh9bILiJjpxHSdZN7/lHiayR4iPxBNWZUdaccvrVZOd0kN5kf vy4gpTQ0zuTVLC4qkRawz6WGMVx+nGLnoaJkMPq6XYh2Q1dCQ4AR5p7NCZHt6oVcXQvA MUVfycrqinIAK1j1+9CocjqgTsscZCQwgDdxsEI/IBIK+J/KIa9xGCUv5GXf6jOoapyJ cyMpCVQ8RE20e+U+VVJAeImZhUTPuLqA10PIQBc55p+h8WzOlflPTiuB2qB3j9XxR542 ga9GF6xd9EpLKoCXc20Y1anxA1m+8c6aOiyZOyYmQfH+L4cfPn2qV9cSi2yfxw9JCp+C HviA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782742616; x=1783347416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3SjUvXL/mX56mOYrPBguEs1h3doPmK8H6vkztD3URlg=; b=iF9Lh/6qs9o0fCW3zvaqjp5oxmW0xe7PfF2lSKE8G83DR6vcUi30PSJpwq3+8OYyCQ x8+tz6qZI+RvoL72o8ZNC3Vcgozc24hpTGQDJZvnlOG3a8XIzw9iEOnyz1yRl9aCTB8k PpzMWFbED6TAAzCKDeh6jD+Un5M5s8NUMFXIz8clywy6zJI7j8iVdNRGeSlgs8eEO2Ql gilleXu2/NY2s9YIdQjvujy9md9TrpCqiPoYySZccnhuw2CfciYkZ4FgYt6J8RauNmz7 e5E2GlbdDth6K11kE+wxZm91YL85A7jXtGLohi0uwp17qs43ret+NLBQz3BuwyKWeICX pu6A== X-Forwarded-Encrypted: i=1; AFNElJ+YTAWjRUKEtUQ6FFfHo1n+T1N8Us/1WE4P6+APmuimltOQrYQAVlPTaQMMJQmGZ1juWT8xerTCs/Er+VM=@vger.kernel.org X-Gm-Message-State: AOJu0YwDVWtqSbpeGWDpMtNJfpulI1n0w9rkYCP0obl1xdVJKCTdJulH P+ePfn3tk7c/EhThr0G0jlmZGRXjDTngJncga3bw2A5VmxvyqSr2NGaY1THzA9HeGBC7Xy7C8bI o1Lh+VnUlJtQDsoK22SPltBCG5cxPGOJYgXv8EKfiprsu7A/AWXEEF9hsK8Vf4OLMUwk= X-Gm-Gg: AfdE7cnL4e16wU4dMPITPQ0KQ5Oxz55xt7e+jUMn+UnuU2/LlcP66Npm+RU+AvymQ0T fy/xlo5iMtScmaNptoqF71VAsOktBNb7+0epEpbYWKJLKcWVloR7CiWvQ3V2O0kZQIwUT+cbS2M 2cGI3M4TbiARWkfshdGeUMoJClY0ClAqGDnpEIjCRQvcLjGVnRx3XHBh5SB6cLngIFOcleVl+PI mAKbU+CsX51r89CUMfMI7MDYb9dT1Yfthxi9d/6LRNoiOR1nXiZgmHW/u5D/sjQ09TLJ+oBgeOF QJ3U2UJl3lDG6JDhIPq3D5H4u2vSTgdQ7HuiDGzHFdYnfepN2Zu/iXYbP6oOn63B7KAqyTXzp+s gyTXf+cTfDKIW6zIhqqoBZEZglxWFyqO1pADzzndwq1duIos= X-Received: by 2002:a05:6820:4b87:b0:69e:53fb:7867 with SMTP id 006d021491bc7-6a13434f2a1mr10237313eaf.17.1782742616015; Mon, 29 Jun 2026 07:16:56 -0700 (PDT) X-Received: by 2002:a05:6820:4b87:b0:69e:53fb:7867 with SMTP id 006d021491bc7-6a13434f2a1mr10237234eaf.17.1782742614096; Mon, 29 Jun 2026 07:16:54 -0700 (PDT) Received: from hu-mohs-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e9aa5d3500sm8584812a34.8.2026.06.29.07.16.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 07:16:53 -0700 (PDT) From: Mohammad Rafi Shaik To: Srinivas Kandagatla , Vinod Koul , Bard Liao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Mohammad Rafi Shaik Cc: Pierre-Louis Bossart , linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] ASoC: qcom: sdm845: skip set_channel_map for SDW stream DAIs Date: Mon, 29 Jun 2026 19:46:32 +0530 Message-Id: <20260629141633.86657-2-mohammad.rafi.shaik@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260629141633.86657-1-mohammad.rafi.shaik@oss.qualcomm.com> References: <20260629141633.86657-1-mohammad.rafi.shaik@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX+lgdDyYmt0s/ fE5wKqzcrvTJ6T7YkCXTq/2lTDjREL5KJvuM23EFXXkj3js/7+BbKV4+Zzlew9QTGFMCCMQYUoy SyNRSBuMJaZrnYg64IO5cXxKxTzs9TOzfizOKQnVeKPKeFqmMW7P0pEJHaGMSeuYh9FMGi/Dpwd ROludkVmFioC4AMFh847cGp6I00fOBFbwJd7NeHF05xiADYnrCD3JWi39MVHxK7PG+DJF0WVnYC rJ3N7A3tsKCzvz+cdNgVeBKcACtFa6rAdl1bhPsenNei+ZjavVz5eYAUGiimV+qRPHKEmMQ1xVw 31C/w9MIRlROfSoXiD01Ik+aRiYWkmvam1pGBkO2el0sPvFYJ6wgxhaE7QiKiwfCOHbFGo4gj73 WwSKWPjb0gQSCBlCCY5KXTjD43KR+O1BxzznX1wfAUPiEcAX9JQ7IYI4NOhtGmbYbwxdmGz+Fio 6LYTty9rn0CvS6Bttrw== X-Proofpoint-ORIG-GUID: P2bDbBNOSPSms4XDMJjg1krZqzfQJ6E5 X-Authority-Analysis: v=2.4 cv=T6q8ifKQ c=1 sm=1 tr=0 ts=6a427e58 cx=c_pps a=wURt19dY5n+H4uQbQt9s7g==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=fJR0_yvY6LQ15X-jUkIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=-UhsvdU3ccFDOXFxFb4l:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX1k0nQzHLom3K l4YoRTo+tlVpHq1GclU+9GN1peJluy7MQHx03t65yFtp9xYrAEx7TGQvuWn9+SAElhhEl5JdnPY DMAFQGz/XXT+LQGuOVS/1nyOihAKQSU= X-Proofpoint-GUID: P2bDbBNOSPSms4XDMJjg1krZqzfQJ6E5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-29_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290118 On sdm845 the SLIM Playback backend lists wcd934x alongside the qcom SoundWire master and its SWR slave speaker codecs as codec DAIs on the same link. sdm845_dai_init() was calling set_channel_map with hardcoded wcd934x SLIM channel numbers for every codec DAI on that link, including the SoundWire ones, corrupting their channel configuration. Skip set_channel_map for any DAI that implements .set_stream, as that op is the distinguishing marker of DAIs that own an SDW stream path — both the qcom SWR master and SWR slave codecs register it, while wcd934x does not. This confines the SLIM channel map to wcd934x where it belongs. Signed-off-by: Mohammad Rafi Shaik --- sound/soc/qcom/sdm845.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index 0ce9dff4dc52..509d7a551397 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -294,13 +294,26 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd) return 0; for_each_rtd_codec_dais(rtd, i, codec_dai) { - rval = snd_soc_dai_set_channel_map(codec_dai, - ARRAY_SIZE(tx_ch), - tx_ch, - ARRAY_SIZE(rx_ch), - rx_ch); - if (rval != 0 && rval != -ENOTSUPP) - return rval; + component = codec_dai->component; + + if (!component || !component->dev) + continue; + + /* + * Only wcd934x (SLIM codec) needs these static channel maps. + * DAIs that own an SDW stream — the qcom SWR master and SWR + * slave speaker codecs — implement .set_stream; skip them. + */ + if (!codec_dai->driver || !codec_dai->driver->ops || + !codec_dai->driver->ops->set_stream) { + rval = snd_soc_dai_set_channel_map(codec_dai, + ARRAY_SIZE(tx_ch), + tx_ch, + ARRAY_SIZE(rx_ch), + rx_ch); + if (rval != 0 && rval != -ENOTSUPP) + return rval; + } snd_soc_dai_set_sysclk(codec_dai, 0, WCD934X_DEFAULT_MCLK_RATE, -- 2.34.1