From mboxrd@z Thu Jan 1 00:00:00 1970 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 0D49E2E2DFB for ; Mon, 24 Nov 2025 06:50:43 +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=1763967045; cv=none; b=BZrqt3sQeUybRewJxqbt4gVXdhoCjIvA5vriwwEW/9cF8ErvjFJsJRgGrxdTZLgoZpb8xK0wpXsI/ppCDOko1vxAyU0Mm/h4ZSFtqpf2k+iqiVlN2Lm0ho0gncWLDkZfjpCSV9tX6etYT/mPB4mr5CsTz10OYBjypu2TI/SM9ck= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763967045; c=relaxed/simple; bh=hPxffe85SE/feRXKwYw8pMZU/39AmCqapyWMwo4D6cQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rxXR4viZ9iK+9SozCc2pgUFXzxfsZ4pUCztmRJyhvTrdmWhg7rn/o1opd1kPwmNTXeqS+mbvMaJ9rAq39DnWBbmh7xsvSspuh/HeCgp+rNvoU5z9qMVowPmsYwjotnX9Tu1EwliLsvZMn3Jw9KEXsf3RgHt+WHOYmLwbI7hhRgs= 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.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="bGsyp2Y0" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-8b2f0f9e4cbso346270185a.0 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=fAGzJWw9JgPgj3bdwZ1Ux/BIxEbsMlc3KpMrItYk5v/c2ADqZ5NkjdyFKqbS1NM+uy +7PUo+4oQLCqwwUkfXILVucZZMUfPMsQe9fSS5uV9vhY56iWM2jPJdP6PSaGttvwvMSi MLaCCHze2sSch2Lr9JaVgAleDKm5cppzdPR9ww5V1yui6AUQ5BRPlGie0CXMtuSlvU2t 5XzkpsuHUaS2Agt+4aUHuglluZbqxZvT1jKnGscPkKPU3VTvoeEJJQFUlL872pKVEwKJ vywcFAxbSb04Rn3cqn1O8BuwP7dN25pbFxWwn6HWJmepwMJYWvi6Th5uRAUxt7HtpA9l Ybfg== X-Forwarded-Encrypted: i=1; AJvYcCVE6+YykyQSdTETsJfVwySZD6Tujrah73+ZupO3diyXm3/y+cUgit3mQZs60/d4fBpe5la69+Z8UnnfXw==@vger.kernel.org X-Gm-Message-State: AOJu0YwnrGe7BCkw5T9ZvnVl0lMQANeZqRYZF6Hu1tnuLQCkO75pQBpv 1kyNIfi96TG6p0RAxoljZ/rAnT6oxOeZ9IY+Z4ygx9bp8Vn3VB0+CwVEJaRVcubjGEk= X-Gm-Gg: ASbGnctctZy9AwuNAG27l8yjQRI9VoJg6htprDNXYOb6hjNzF2Y7Ply4s1B+WErbYJi XJMAb+Mr92Y/CG5dcvguYTo2IwN08TszTy1VSCa1LbQGuljfzy36GFmq8OsUT30atXCMK2j7iIk svkS4cqb59R2ON8DFKaMIp0sx4F2++cArc7Ot0A7FcxFBhVvbpElQMJ/oRTC0+SEiGuullYm+Uc 2cRmGzfFW+P/0MugF3dWZQ0/zjEXMhvjiPx+VZ+tLxEkErJpaGKHSelqh+/EQ4eIZ46CbmNmMlq smPb/UIj2fi4jik/fKdqszKqI+S66vxZ05dlrOJp5I9gaKkNn2XrqTCknJ97d3cUDqGK3cs37Sz Cd+bbyIUGS1IOA+r9iyclW3M6SxKdY+GrRnIRoAkm/Htq85rwhllai/7vU8ofCcZQq8SxVqPuxB gGLdBcl+1CfZxGB+gz/EuGEBuA1oCfgSbtqQzulzlPGpAvTDC7vYo6+HSIguuRBVXrSA== 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-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 = snd_soc_component_get_drvdata(comp); struct wcd939x_sdw_priv *wcd = wcd939x->sdw_priv[mixer->shift]; unsigned int portidx = wcd->ch_info[mixer->reg].port_num; + u8 ch_mask = wcd->ch_info[mixer->reg].ch_mask; + struct sdw_port_config *port_config = &wcd->port_config[portidx - 1]; - ucontrol->value.integer.value[0] = wcd->port_enable[portidx] ? 1 : 0; + ucontrol->value.integer.value[0] = !!(port_config->ch_mask & ch_mask); return 0; } @@ -1811,9 +1813,7 @@ static int wcd939x_set_swr_port(struct snd_kcontrol *kcontrol, struct wcd939x_sdw_priv *wcd = wcd939x->sdw_priv[mixer->shift]; unsigned int portidx = wcd->ch_info[mixer->reg].port_num; - wcd->port_enable[portidx] = !!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]); 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; -- 2.51.0