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 8BBA2262D14; Mon, 22 Sep 2025 19:35:42 +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=1758569742; cv=none; b=UCj0NpVtZ6pCb2LPa0Ox5ocR8XA8Xcvb2a6nVC39vZhexvOpg69N1/REeRirWRbOxC6AHzpfQwWYSmFrfpiDu0VyGTvS0Us/pIWNH2kIc7jYlWn5LC4qmNxwqJc+KsCnp2ExZ4YAhLPyLDy+3awMbelcxIdyCw/3TbNinBdbdfM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758569742; c=relaxed/simple; bh=6lh5BPmJQjRm4a0ti1+VsZdirBgzc3+GROGm9200s9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JjRqpAIEG8r7WnNjN7NcjSlA2cIwfQ8uN3lSq/KHQqgPwWakYOAQFXRDKTzQN6sh6zC9eaMDzympoPDRycnhgNvBPacRkQIA0opBgeyP/ZJlZRJp1XkeZr0x3pu4iJ6fQFanIEARByIDGA+Of+t+x2J5xaEBc5+FxEK1wACTnb8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dh0/rq4T; 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="dh0/rq4T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23599C4CEF0; Mon, 22 Sep 2025 19:35:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758569742; bh=6lh5BPmJQjRm4a0ti1+VsZdirBgzc3+GROGm9200s9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dh0/rq4ThCl+rOcg05pRA/feANBH9QkqOZ8M1hsSn8342NvfIr7X0LBUM7Cea/GpS 3VuBduxrTmYvNzvB5iZec7oJLsVxOxD4yegE15Cna9lF+cb1gPxV78wj12/Tovs6nS Z8OPCxq0hYzf9DlAMlkS4R9Xh/GVFWgAIEnRupXw= 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 51/70] ASoC: wm8974: Correct PLL rate rounding Date: Mon, 22 Sep 2025 21:29:51 +0200 Message-ID: <20250922192405.978510901@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250922192404.455120315@linuxfoundation.org> References: <20250922192404.455120315@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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 9b17d3724df55ecc2bc67978822585f2b023be48 ] Using a single value of 22500000 for both 48000Hz and 44100Hz audio will sometimes result in returning wrong dividers due to rounding. Update the code to use the actual value for both. Fixes: 51b2bb3f2568 ("ASoC: wm8974: configure pll and mclk divider automatically") Signed-off-by: Charles Keepax Link: https://patch.msgid.link/20250821082639.1301453-4-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm8974.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 260bac695b20a..2aaa1cbe68b71 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -419,10 +419,14 @@ static int wm8974_update_clocks(struct snd_soc_dai *dai) fs256 = 256 * priv->fs; f = wm8974_get_mclkdiv(priv->mclk, fs256, &mclkdiv); - if (f != priv->mclk) { /* The PLL performs best around 90MHz */ - fpll = wm8974_get_mclkdiv(22500000, fs256, &mclkdiv); + if (fs256 % 8000) + f = 22579200; + else + f = 24576000; + + fpll = wm8974_get_mclkdiv(f, fs256, &mclkdiv); } wm8974_set_dai_pll(dai, 0, 0, priv->mclk, fpll); -- 2.51.0