From nobody Tue Dec 2 01:04:43 2025 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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 23BC92E2EF2 for ; Mon, 24 Nov 2025 06:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763967046; cv=none; b=Zrssmu4LgzhiZ2W2Mvx1gI7ObO/Uwj7PbKpxMBb4DhDs/qC6AeM/vNjpW4CC0KmVJbd/Pyu1TcnozwpnYqkmOnE+tBPmond9tChpijfe+m9Ci1IXdpLG7maxlLmmQdjY4X/AQEJ81oK6i9WHTy/KDzLxWl89dgvwloTWucNV5Rc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763967046; c=relaxed/simple; bh=hPxffe85SE/feRXKwYw8pMZU/39AmCqapyWMwo4D6cQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ebC3DOaGoJSe1Jnx8O96p18j4fcPyrV0pa6HZS0Q52kn3AtS1/BdcWW5I5GvBGF90v7Cw6K2UzCghzOEmfrbYCnQI4ZN4tF6AQF+E4YWJitW4yxbgssVc5iy1IwObtGgBpRtch1/5fB8E4ilxL1BJlepY0gFVTuPCqMjUtTn2pg= 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=bGsyp2Y0; arc=none smtp.client-ip=209.85.222.173 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="bGsyp2Y0" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-8b2d6df99c5so551451285a.1 for ; Sun, 23 Nov 2025 22:50:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek.ca; s=google; t=1763967043; x=1764571843; 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=hBzF9N1dKK9aG8cBCXibRQcXrqo/BdkER+uqsD1fva0=; b=bGsyp2Y0ElvH/UVMAk/BWcyJ9AnJfiMuyt8Dfd16p1fJPskhLYxBS+5SP+ndYmWNtp zNK8CiYI+FezF1KkAD1fha1njF9p8KJn/h+ZwSW6LFQXx1AJZASQTlSFaC8GvoAc4fOM ll3CP5z0sez2n69Z6UPK85NHMQBwIuJxCohrZAJw9qoxUG26hn+sBzGQPxZo8aXBr1cD CQ3UjndRrfqfpFWH2jDIUimlW53uRMssPX0EDjIQdYk/3C/xWoW6C/qEWjYpm6xLyzBH JS8KfVvwVmXAG/KUND7wpf3S0ZN8RdK4CI4vDZt4Wc4BA4ENfA0DjA+qZYrPOAzsifCw 7bpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763967043; x=1764571843; 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=hBzF9N1dKK9aG8cBCXibRQcXrqo/BdkER+uqsD1fva0=; b=GkQ+6bn5zs2oc8U1TZMW/uyjmIEOUVv3r+TniA+IpgBqPldBYCQ41/05nLpNCGZ346 1l3LWQ4iF4rN1qR88IDFXnQZvCTrRMs+9uWkE5Yhm42xVqmbwOgtE1IGe/IxGlemrvxw P+7OMs9PyGnJ8YEj79uyRpc+3SwgxsVaVQy+J9TUBltSknPQMazbvRlofBWQFrKccq57 51Hfx4jnmlEIMMal99pEqdzw8vi7wm9xdOr4WejFlhuqGlAOy1rgL9e8TABukCy1Hzaj 1MKBG3v6w2ZO/VOBJYLTKqVehDQaS9PCk7Ef+hDThUJ9iUOlmlg61tA2QaLTDRsljM21 9Elg== X-Forwarded-Encrypted: i=1; AJvYcCWQASSYKyzERIJMKFUmr/OwtHo3yL5c998YsI7jHhCqe4hn6PtBTtMU0dvje9J+d2adQgbR7ITi8RczmGY=@vger.kernel.org X-Gm-Message-State: AOJu0YxIRRR51qYGSj6L5bcMAt4h/KYvpj2TBZ8B87X6SI6ijfuJaWJr xU/55Jxe6Td6+TW6N27UMHD2T7Y6xtTm5VqnuA2tDw1gVelskjGH6FMViBBI5QRjN7Q= X-Gm-Gg: ASbGncvqMwXUc2Rx/kr4JGcn6iJ8hSJ0Gne4wyWQ4iQ+/X2fgj7WHeEh1XiIuhQa2ID 92jxEXPdAwS0o6ogCxJlMJmRlza5vtgzdOoLjWkyOCqio+/Ye3qdNMur3tt5yilr/wZqtxUl3CX ZXXPQu+ANeZNa386aO7IDl4XsX4VdSqAmuHREBSAPyMy8HJTdL83MxFsbtwa+77co0o9Nk47yuP ajF4HQQsU9VUDYxu2WYjKDvF5BfN6L3b+6V5Qg91SlVgyQnPHjlwxtNx9qLXwnPexdM/HCRNjgX ZFmSL9yA/mkjYKVnR38ZmkIkLDf65L3kP9kMntwQkhFULXlEH0YuVsKJjVt8inGQf2EeVX4YcSu Ezs295WmoLvP2FUMKt7u+vtx92AqnzwMFR6abFuabXPQLgLKHnUd0+PKu9zaiM4nLmQfGsg9YDi h1kiBiqrTpCGWW+SJos4BRYtHzGpevAnjkuk1E/xp79rUCecwiBfoCgmLa8Oksm8r3Hg== X-Google-Smtp-Source: AGHT+IGeadpXTYxre3q5TarwP90JExiHx4plmAto9YjMNpDKthPh+yqnWxesSrme8bdG5dYdEFE8Rw== X-Received: by 2002:a05:620a:3949:b0:8b2:f102:b907 with SMTP id af79cd13be357-8b32af2f63emr1931671485a.37.1763967042983; Sun, 23 Nov 2025 22:50:42 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Nov 2025 22:50:41 -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 5/6] ASoC: codecs: wcd939x: fix get_swr_port behavior Date: Mon, 24 Nov 2025 01:45:58 -0500 Message-ID: <20251124064850.15419-6-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/wcd939x.c | 8 ++++---- sound/soc/codecs/wcd939x.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 48f82a92722dd..8a95fe39792ea 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -1783,8 +1783,10 @@ static int wcd939x_get_swr_port(struct snd_kcontrol = *kcontrol, struct wcd939x_priv *wcd939x =3D snd_soc_component_get_drvdata(comp); struct wcd939x_sdw_priv *wcd =3D wcd939x->sdw_priv[mixer->shift]; unsigned int portidx =3D wcd->ch_info[mixer->reg].port_num; + u8 ch_mask =3D wcd->ch_info[mixer->reg].ch_mask; + struct sdw_port_config *port_config =3D &wcd->port_config[portidx - 1]; =20 - ucontrol->value.integer.value[0] =3D wcd->port_enable[portidx] ? 1 : 0; + ucontrol->value.integer.value[0] =3D !!(port_config->ch_mask & ch_mask); =20 return 0; } @@ -1811,9 +1813,7 @@ static int wcd939x_set_swr_port(struct snd_kcontrol *= kcontrol, struct wcd939x_sdw_priv *wcd =3D wcd939x->sdw_priv[mixer->shift]; unsigned int portidx =3D wcd->ch_info[mixer->reg].port_num; =20 - wcd->port_enable[portidx] =3D !!ucontrol->value.integer.value[0]; - - wcd939x_connect_port(wcd, portidx, mixer->reg, wcd->port_enable[portidx]); + wcd939x_connect_port(wcd, portidx, mixer->reg, !!ucontrol->value.integer.= value[0]); =20 return 1; } diff --git a/sound/soc/codecs/wcd939x.h b/sound/soc/codecs/wcd939x.h index 6bd2366587a8f..dab7ef108b485 100644 --- a/sound/soc/codecs/wcd939x.h +++ b/sound/soc/codecs/wcd939x.h @@ -899,7 +899,6 @@ struct wcd939x_sdw_priv { struct sdw_stream_runtime *sruntime; struct sdw_port_config port_config[WCD939X_MAX_SWR_PORTS]; const struct wcd_sdw_ch_info *ch_info; - bool port_enable[WCD939X_MAX_SWR_CH_IDS]; int active_ports; bool is_tx; struct wcd939x_priv *wcd939x; --=20 2.51.0