From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C37E6C4167B for ; Mon, 11 Dec 2023 14:01:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343765AbjLKOBt (ORCPT ); Mon, 11 Dec 2023 09:01:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344061AbjLKOBf (ORCPT ); Mon, 11 Dec 2023 09:01:35 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B672344A9 for ; Mon, 11 Dec 2023 05:59:12 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28BD5C433CB; Mon, 11 Dec 2023 13:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303152; bh=4IN9SDaQnEc23NiGO/oUsebvHqqV0BLtqUd11IAzHu8=; h=From:To:Cc:Subject:Date:From; b=L6Hvm+xij9VXmzuXf/Qu5LTXYFRf3ldU/ZrLEFhuRdysVTJ/o8haG5ITuu6RJLsqu 54K9KD7XziDCvrRDUhx8mTenUX94XCXqoSFrx51AYJ7H8M7vyZ8AJ28ZRR7/nlazC+ 3XcZI01POTmhfS2UjL9ckyljeHuHcgmX+llkKbLny61pzmffjOHCgD5SZDxc/B4/0/ wjVPQqzZt5FIzuYbK1OIa0RQDqpM5O97qAvaveYUpxBIg69tPRmi1LsI3xk5ZooGXu TOsY94y7EV9UXrJN+AnFyrsQiQfCCOykq/W103kvTUO74gNDYnXbFkWK1c7sfgZRhr /AEMUdR1Zee1w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Charles Keepax , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, u.kleine-koenig@pengutronix.de, patches@opensource.cirrus.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 01/19] ASoC: wm8974: Correct boost mixer inputs Date: Mon, 11 Dec 2023 08:57:35 -0500 Message-ID: <20231211135908.385694-1-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.142 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 fdc68ab497427..9eeac34435664 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.42.0