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 23010148FF4; Tue, 23 Jan 2024 01:08:05 +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=1705972085; cv=none; b=fSsisuC1JHyQBJzNhi8GHZJW5MqSE7SuiXVcwPnJw0GUX1tNI+2IY8MjpjHvgmvG8FklYcIHIJd6s676zK1VztXUMBcr2WaYvR2M7csqXxBNz3cEzRyFd13lqIDTysuPeGGyoZC/JaPOeCgJaIxW/Y81VcXxjc7mEQiXqiH122s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705972085; c=relaxed/simple; bh=sob86fwMh4bPwDXhQUtiDiHe/tMNdxekpkIoDdIHd6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=odvzCiRo6Fq0IAZq4+NfcSOsegkVGPoDYpUfGrxaGztP75+eWlBh5M+W50uiM1SHwcx5uw1kqV5saXduwz+BB2a8l75uDZF+ve+wL3sio6T9bXwsSK0CZP1LGdQOjvnxqQwjyT9ZLasz5Dn15LJDsJGjSI5W5GKU6k9Awf1nRcE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BZ/oXkYf; 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="BZ/oXkYf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8777C43394; Tue, 23 Jan 2024 01:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705972085; bh=sob86fwMh4bPwDXhQUtiDiHe/tMNdxekpkIoDdIHd6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BZ/oXkYfC7F5smKZKoWKLTXqZwPTk0dhukQ9RwcFD64072JLkyY76pTK03oo5rP/A tHi7+4rVXf9Ux69MKVFKj3EI7KKyFznsdC+p6iWvZB8b67ILZU+9VaeDLok2ZOqrZS wvIFtEF2CFqe7gxTgPhLiZBCBi1TM8aQfVtgfcfI= 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 5.15 009/374] ASoC: wm8974: Correct boost mixer inputs Date: Mon, 22 Jan 2024 15:54:25 -0800 Message-ID: <20240122235744.949594317@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235744.598274724@linuxfoundation.org> References: <20240122235744.598274724@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 5.15-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 fdc68ab49742..9eeac3443566 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