Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp339424rdb; Tue, 16 Jan 2024 01:41:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IESHQH9c4P2TwpB/BITgDuPQUwCw0MoYuFn3NeiyiSyBiU/allBrBlln/dmoHxTJyD05xwj X-Received: by 2002:a05:6512:205:b0:50e:cbf1:d2f8 with SMTP id a5-20020a056512020500b0050ecbf1d2f8mr2763598lfo.134.1705398091399; Tue, 16 Jan 2024 01:41:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705398091; cv=none; d=google.com; s=arc-20160816; b=hXppznI/pywtw9RR+oEQ7aNdELH1g8A625aRoR32ZPliKnJedMIYa+k51uWRvSGj+2 aL1zJ8y1SJQU2cSB7j7ydnWKj98JWfkerhl7jwXUoxbUGaWJH5TX2kBeWeJmDyLbbYxP Hl6pFLqaQEQCu6gSCnObAxSOGZBNeWjsmnLwyfTrhjGNG3jORxdJ/SrJvx9J6gO9LWOB XiIp8b4ZDaF4LtFTg06Bpjh9/hAf2U6ms3SEeVsjYc/xcKhGE5+N058WrnaSUHzzNgx5 mWwX1P78F2QxCPWsFkvmxu4nyUhelogfynC0qP2h8C2+SrudRexGsYuKsBt0ZJ35uMub 8jwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=aEHhQ+phVMUHPuKUNClZPkY0HkmVeX2XyxtYLJU7CQk=; fh=KKP8zTcQJ3oaRk5kFpZOVuVwNJRF3rULozot/hU/FVs=; b=irSBpmAVBMRCoiQ4XDgN1f9JLZ4OpxP1dWnLx9RpuPHPfvioqLHbhvBq7UzoKBo9Tv xKMOJ1eA1Wy5ftnIrGrcvnwfnS1JenD0YYASzca1zobZGzax42IVwGJTrOQisVrq44My 3cSkgsemyk3obl7moh/Fa7WvJAl1pjvFX0PoEVYMxYWQY8GxqDHMDtmCuvwzNzi+dRKr OF5JcZm7BQHGI1/xS71EdxvNWr4/HY+OS6QsztmcBEzayunfqonWuZmIhMBugLPPhcCc IZpsBnN8/hTgQh8iVzci6nNSMIfqJv1fdEK1Rjm4J1t0NgMDCJ95JEDqmdZdvWI4Dzpm /BRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=srMWK9ab; spf=pass (google.com: domain of linux-kernel+bounces-27192-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27192-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lc5-20020a170906f90500b00a2e81b288a0si286661ejb.329.2024.01.16.01.41.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 01:41:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-27192-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=srMWK9ab; spf=pass (google.com: domain of linux-kernel+bounces-27192-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27192-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 265751F23EB5 for ; Tue, 16 Jan 2024 09:41:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D47901B7FF; Tue, 16 Jan 2024 09:39:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="srMWK9ab" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 39AAD134A1; Tue, 16 Jan 2024 09:39:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E34AC43330; Tue, 16 Jan 2024 09:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705397981; bh=mnsvv8nLXcpID7aeu/iuGLMoF7xZR5DEBr8yX7bAx7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=srMWK9ab1BIYiHFwgI2B2+w1VwIwAs5MRYycieUR/UqX2/NlVT1DqOvkuvQZFwuI2 1NZ2CkD1LX+bjLz1x75526r3oggFIXzPzVbwpcvY8bkZ0enYTmIiSJkDxokVwWjG96 U8HrIVW/M0I9DB0vq0SxvTqBaZlewFzpm4DPwn9aF4cZIbXdETXpbmRThEmHC30v9M ShVnMrj0oKVqRsfmLodGn59RPmz1aySjA3HTv9m5vGaUYvA9juNQGy+SiIkvVfMiUn kfR3DcAi1pqcnjGTyglSKBEL70kFgKP0vqpqlwVChEWtub2LLiFsNMzCWuTg8UmEEI yt2hpY6514q5Q== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1rPfv6-00053V-18; Tue, 16 Jan 2024 10:39:44 +0100 From: Johan Hovold To: Mark Brown Cc: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/7] ASoC: codecs: lpass-wsa-macro: drop dead mixer-path gain hack Date: Tue, 16 Jan 2024 10:38:59 +0100 Message-ID: <20240116093903.19403-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240116093903.19403-1-johan+linaro@kernel.org> References: <20240116093903.19403-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The vendor driver modifies the gain settings behind the back of user space but some of these hacks never made it upstream except for some essentially dead code that reads out the (cached) gain setting and writes it back again on DAPM events. Drop the incomplete and pointless hack when enabling mixer paths. Signed-off-by: Johan Hovold --- sound/soc/codecs/lpass-wsa-macro.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 7de221464d47..36a8f1980c6e 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1220,27 +1220,20 @@ static int wsa_macro_enable_mix_path(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); - u16 path_reg, gain_reg; - int val; + u16 path_reg; switch (w->shift) { case WSA_MACRO_RX_MIX0: path_reg = CDC_WSA_RX0_RX_PATH_MIX_CTL; - gain_reg = CDC_WSA_RX0_RX_VOL_MIX_CTL; break; case WSA_MACRO_RX_MIX1: path_reg = CDC_WSA_RX1_RX_PATH_MIX_CTL; - gain_reg = CDC_WSA_RX1_RX_VOL_MIX_CTL; break; default: return 0; } switch (event) { - case SND_SOC_DAPM_POST_PMU: - val = snd_soc_component_read(component, gain_reg); - snd_soc_component_write(component, gain_reg, val); - break; case SND_SOC_DAPM_POST_PMD: snd_soc_component_update_bits(component, path_reg, CDC_WSA_RX_PATH_MIX_CLK_EN_MASK, -- 2.41.0