From nobody Tue Dec 2 01:04:46 2025 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E65182E611B for ; Mon, 24 Nov 2025 06:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763967050; cv=none; b=YD0JJgOKIhX4hFiVUsEXVjxXkcMo/G5S4gdYzcXmaVdZ2SUUCKc+41Pl3TwPOwmCZqygfh+XN7v8MKoZJ9OpUDeydo8du6AXsMqPMGIyiuT2JO/Nr8HCK1lX1DWUm9iZrmrVZDMB0lkG3u4EnjDbuGa+COhSFAr9Jt58520T5MM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763967050; c=relaxed/simple; bh=CDShQlU/cSjcTsIpI2njOpO2txWPLMTvYbcfH6GtBUo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lXL18c7LVMuncOKDzq843c1b+qXjf9FVM/c+yxugVFgwd7WzIWCmzOTj8zm+fzzBz+7JIZh5gfXVZi/zegwk/a8EyZBGVLahaZ/q/0EOJvcVS7JF9QFXxAEnILRpTKV84M+btk/cBZkEDzFEQTx7OubqBagmA8+E9VSphS1PkMw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=marek.ca; spf=pass smtp.mailfrom=marek.ca; dkim=pass (2048-bit key) header.d=marek.ca header.i=@marek.ca header.b=AsFMxLsQ; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=marek.ca Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marek.ca Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marek.ca header.i=@marek.ca header.b="AsFMxLsQ" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-8b22b1d3e7fso405455685a.3 for ; Sun, 23 Nov 2025 22:50:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek.ca; s=google; t=1763967046; x=1764571846; 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=64NexCTfBJLKpFJlS/fd0Q6ob7ab6FhTIMphcAktnfI=; b=AsFMxLsQaSEyfjz4zb1xlHCFC4f0M6/KidjnJ7VuO+oUhbMU4+hA3lRgtOL/nex9Op uQk0Ogc4pq7mxTx6+y+2GlFodvw0ZI3UnmELOZ97hYU0XVGE8LSF8SS+FGjlkE2WXrtY oRRuMaQ4UHx6inX7ueCR/Ko4gr5Fbcnb1ZyP0PeJrPHl4jyP0TqMWKEFh6iTpk5ee5Sn caNQYo1el2pvH2RQ9t/0x6lvUCgglWbRaHMWbsudNfwTiXaw/vAB6YTj2vlRVdXVSBzb yopBxLFcFNp0B9wpYEpzuxqgZtKuP3hK7IhvL6Gwv1XfQDWdBaFzRDUmGfPfF9jQWBAL IqKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763967046; x=1764571846; 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=64NexCTfBJLKpFJlS/fd0Q6ob7ab6FhTIMphcAktnfI=; b=JKUQBroPHHgVS3hwpqH6Nglqha/fw6QgRrjavr/yfSsVmaDaYYOhd+/lfQncd5kcFV z5QkDr0hrbMAKRYVYr5dQCyl7sJTXUNihEeidpGR0Xq/5N6/GH86f4gbDl7q9ktUU7yj 4hpJ6/5Z6rXy71Uw/Aa4O9VuDBo+yaQyHZPomdxq1Z46Wm+0ODuHOiWsdCP5arVRwc7u TYesXglEt8vqaH2Iku2FNRRqpdFiCAyjHCczRx+6XjTfvC4l0KF2ozbhRs2yqfU15abe MQSkpFrmseuc/KJBt9uliMkCkAxWFzEwsqnthf8o6OoGz1BQe0fVZsjelp5pizNfGvSa 06sw== X-Forwarded-Encrypted: i=1; AJvYcCVGJRqwjTlYdN6E1LZqqQZ79upvs3hXzuQBpuZ588X0aERkmkowiLIszK9dCiqzl9zpTzY0BP6W0AZwVso=@vger.kernel.org X-Gm-Message-State: AOJu0YzpywNcuFRhb33wlj+fCvr9047aqP3MNPa2ymAIGSFNgKJ0CYWR +4LLNjoS6RQUy/yVrQFJ7I+bjYnTtcEr4P/g4nuv9w9AxccGZHzHuZVlYo19ogJmNvg= X-Gm-Gg: ASbGncvRGRjUZDQhiGVEfZ+Q7c6f+JLaTI6c8T6OioaOTGqYUxBUD9FArI0qqDEEvPY ugPhKecrAg6tuRH0+ifsjQbjr8YeMXmkOR1mynfhnsIVbHNM6QEOjkM2oZpXxrGL1ESZgSMBhvc KTPqMCzjz9g9Ok1PA9NyduZSitVb75rnhPuBZRrJ362tdeFVB/zBdKxe4ejda5sfBJtNtj6sDOU aVO+8Dw1+WQdll7RyjqyfGzDochGP/zOvQJVexiC+MRoDqkxZZvOvDnJz9yqxlt7at4gr74wGiv J6E5dVvFVOrxHw7CT487FJxqAOaxM4ixoitG9Y55QvdunV7ypgGAY17e8Rq0WVe8TyewsgbnWYX q5JgByyAqrdF2qhDVjp7qtF2d26ZPWTmTmmPUXD8HTzR3fPhXaW9qlojUSI0lO0HP1RseOuU6QW JJqqpUFoRaRV4kl/w7bgHFA8SKv59DCRTZRMWE0bOsPZnRBx8YDK8u2+mge+HUUW0iEw== X-Google-Smtp-Source: AGHT+IF6no5UKhBX9SHPBCL+XUi89blDXI7xfpEX7F/7tAobu7a/8TUxHIlqxsStDopfRUyd1LswXA== X-Received: by 2002:a05:620a:4606:b0:8b2:f191:2b3b with SMTP id af79cd13be357-8b33d5e2e3fmr1386347885a.67.1763967045778; Sun, 23 Nov 2025 22:50:45 -0800 (PST) Received: from localhost.localdomain (modemcable125.110-19-135.mc.videotron.ca. [135.19.110.125]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8b3295db8b1sm889075185a.40.2025.11.23.22.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Nov 2025 22:50:44 -0800 (PST) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org (open list:QCOM AUDIO (ASoC) DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 6/6] ASoC: codecs: wcd938x: fix get_swr_port behavior Date: Mon, 24 Nov 2025 01:45:59 -0500 Message-ID: <20251124064850.15419-7-jonathan@marek.ca> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124064850.15419-1-jonathan@marek.ca> References: <20251124064850.15419-1-jonathan@marek.ca> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" For example trying to do this: amixer sset HPHL on amixer sset HPHR on Both HPHL and HPHR share the same "portidx" value. After HPHL is enabled, wcd939x_get_swr_port returns an 'on' state for HPHR as well, and nothing happens when trying to set HPHR on because it looks like it is already on. The result is audio plays only on the left side. To fix this, drop the port_enable array and use ch_mask in port_config to determine if the switch was enabled. Signed-off-by: Jonathan Marek --- sound/soc/codecs/wcd938x.c | 9 +++++---- sound/soc/codecs/wcd938x.h | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index cf15190dd61a4..1768209e35ea0 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1839,14 +1839,17 @@ static int wcd938x_get_swr_port(struct snd_kcontrol= *kcontrol, struct wcd938x_priv *wcd938x =3D snd_soc_component_get_drvdata(comp); struct wcd938x_sdw_priv *wcd; struct soc_mixer_control *mixer =3D (struct soc_mixer_control *)kcontrol-= >private_value; + struct sdw_port_config *port_config; int dai_id =3D mixer->shift; - int portidx, ch_idx =3D mixer->reg; + int portidx, ch_idx =3D mixer->reg, ch_mask; =20 =20 wcd =3D wcd938x->sdw_priv[dai_id]; portidx =3D wcd->ch_info[ch_idx].port_num; + ch_mask =3D wcd->ch_info[ch_idx].ch_mask; + port_config =3D &wcd->port_config[portidx - 1]; =20 - ucontrol->value.integer.value[0] =3D wcd->port_enable[portidx]; + ucontrol->value.integer.value[0] =3D !!(port_config->ch_mask & ch_mask); =20 return 0; } @@ -1872,8 +1875,6 @@ static int wcd938x_set_swr_port(struct snd_kcontrol *= kcontrol, else enable =3D false; =20 - wcd->port_enable[portidx] =3D enable; - wcd938x_connect_port(wcd, portidx, ch_idx, enable); =20 return 1; diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h index c18610466d7d8..6650c3788d6e5 100644 --- a/sound/soc/codecs/wcd938x.h +++ b/sound/soc/codecs/wcd938x.h @@ -639,7 +639,6 @@ struct wcd938x_sdw_priv { struct sdw_stream_runtime *sruntime; struct sdw_port_config port_config[WCD938X_MAX_SWR_PORTS]; const struct wcd_sdw_ch_info *ch_info; - bool port_enable[WCD938X_MAX_SWR_CH_IDS]; int active_ports; bool is_tx; struct wcd938x_priv *wcd938x; --=20 2.51.0