From mboxrd@z Thu Jan 1 00:00:00 1970 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 DE22922F1B; Thu, 18 Jan 2024 10:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705575199; cv=none; b=U3cWD2TGhxros9QLDOndoIwTt9iYDG/OOi4DvTbAxQRibEguPNM5si2mSNHVRCrA8miWxA3fTQ9PGSiesZjwO+vWvk9T1g7GfXZnInQfDicm4NxhgqxuaKLZAHSqIHs8yPdYPO7FMFTIvfyj40MitPb0WTH4qdYvGK7nZpcYc3g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705575199; c=relaxed/simple; bh=RR1k+SczGvPZpBy2H4/SCDOanPWX9fOJed0+FRLSy/8=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:User-Agent:X-stable: X-Patchwork-Hint:MIME-Version:Content-Transfer-Encoding; b=DLHx7R9L71pVHRXhQjgOo9cIdzj+UGM3oyOJ78B1YRuf779bmb3tTXbhkZCAIX4ESEb2L1hobHxQqd0z7ddpIEMbcaucLlC/VjPJNcmJMIMTTOsuvXpp3+ZShjgDBznjt5YLHMhDgjHsXCiVzMlmVYch6aFUyYjL5b2YUqHo57A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NAHbOyE/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NAHbOyE/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6209CC433F1; Thu, 18 Jan 2024 10:53:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705575198; bh=RR1k+SczGvPZpBy2H4/SCDOanPWX9fOJed0+FRLSy/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NAHbOyE/BPaQbZMqwM7u6xtSW+HTwcZDLf96nwEbTunQlHvJKVhu2WeZKAOhWtz5O Ie07Ttn5oK6np5BxTJ89UN+oI8eu0Wkqvlr98f5myuJhtoaxlOx11Ea14issuTQGco ttsnPJjDcoO+/EemeRtZqHjZbThcVnmSb+rMyPRw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 6.6 029/150] ASoC: wm8974: Correct boost mixer inputs Date: Thu, 18 Jan 2024 11:47:31 +0100 Message-ID: <20240118104321.432796413@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240118104320.029537060@linuxfoundation.org> References: <20240118104320.029537060@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Charles Keepax [ Upstream commit 37e6fd0cebf0b9f71afb38fd95b10408799d1f0b ] Bit 6 of INPPGA (INPPGAMUTE) does not control the Aux path, it controls the input PGA path, as can been seen from Figure 8 Input Boost Stage in the datasheet. Update the naming of things in the driver to match this and update the routing to also reflect this. Signed-off-by: Charles Keepax Link: https://lore.kernel.org/r/20231113155916.1741027-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm8974.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 044b6f604c09..260bac695b20 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -186,7 +186,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_MONOMIX, 0, 1, 0), /* Boost mixer */ static const struct snd_kcontrol_new wm8974_boost_mixer[] = { -SOC_DAPM_SINGLE("Aux Switch", WM8974_INPPGA, 6, 1, 1), +SOC_DAPM_SINGLE("PGA Switch", WM8974_INPPGA, 6, 1, 1), }; /* Input PGA */ @@ -246,8 +246,8 @@ static const struct snd_soc_dapm_route wm8974_dapm_routes[] = { /* Boost Mixer */ {"ADC", NULL, "Boost Mixer"}, - {"Boost Mixer", "Aux Switch", "Aux Input"}, - {"Boost Mixer", NULL, "Input PGA"}, + {"Boost Mixer", NULL, "Aux Input"}, + {"Boost Mixer", "PGA Switch", "Input PGA"}, {"Boost Mixer", NULL, "MICP"}, /* Input PGA */ -- 2.43.0