From patchwork Wed May 12 14:48:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 435574 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp4960491jao; Wed, 12 May 2021 09:00:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAl7z8cuFIH/+u/MSbCyZaV1oCDy14iKES1p9warXhyJO2SzQRV1CZRSLk746m15DjS8dX X-Received: by 2002:ac2:52b6:: with SMTP id r22mr6567555lfm.261.1620835238633; Wed, 12 May 2021 09:00:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620835238; cv=none; d=google.com; s=arc-20160816; b=obWMW25Qri0fGh7igJwbmS7hWZekrW7RjM1dSUCtpI0bzm/TYy5rGjrzy2uRoMHYkC jQ6dP67r2fBx7QHjumyWson4Eh6BVJuqdE8JlIoZC8FcXR5TUGiCrSVbTXyf6e5/PgBI rVRmAUhbBO/3kUdjbO6huWjp8CWqukQtwAF99QTiklk6aPGQ9p9Pg8xJXw0GSgXm2rn8 SCpkBJFWREkPHjcxmrKodKggdvq8aGXYqzIOS6yw+uNKb1dzSOxxb2RKBl3k+G6TnkB+ OMyeo0JE9u8jwDDuf2A7fKYMoKfmycYPR6JvoHkrIn3O8vsyMYu/pze/zduWhqNAab+f OqJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=63vNDlSzO23XWJiGbJy+0dGLU2Cddxw6R6XvkMKt/h8=; b=Dxsji03CYIHw5Nf2EuU3H15UZtlr6JyLgTe4Tgxm42At0Cjpi8lqjxikIGzTbIjGc7 HZC6npr6zu6itQELmQirLcHeDrMX++t4PQyiXsPdDINJ/oIxrlOx9hB4M6QKAdTF9rny St5G2faKohq7UrXNzfJq29jU72xTTbEb6Shq2iENZ2GFan2pyb1XSu3TIQKhaQQN/Kfi QRWVPr1GLTG7JjrS6EFSs8Xd3A4nXC8LFi52zNBwWxGSuE68T/Vm8C+YLm9rCn/ZxK/a 7280zCtN+FyHDFyM6JYmczqzgRxCu+PVushN7oNJU6qkMzZaT82HhEv/qtQ9JjwPqCuq pwkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R2bmt2vz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m20si100438lji.284.2021.05.12.09.00.37; Wed, 12 May 2021 09:00:38 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R2bmt2vz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234844AbhELPmF (ORCPT + 12 others); Wed, 12 May 2021 11:42:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:56350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236300AbhELPhe (ORCPT ); Wed, 12 May 2021 11:37:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC87361C59; Wed, 12 May 2021 15:19:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620832744; bh=hALnn+T+L39ELRVhqq9IJ5RdRHuelmI+6sKPH9+UmOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R2bmt2vzFE/IGwG/q/RjW5jsI81SsoSOU2tI5HXUidSrBTb+OSOG0SszqciDhvMSu o0b6QY4pe+6kHTFDv+nBY9UL/swrwk/qKlxSRVAZjALIIIAMqrz3gHo9VQhyomo17x qACT5reQZWvZQCC29kXcDKilexVwdhOMhu+5t7YY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Daniel Baluta , Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 5.10 371/530] ASoC: wm8960: Remove bitclk relax condition in wm8960_configure_sysclk Date: Wed, 12 May 2021 16:48:01 +0200 Message-Id: <20210512144831.973693687@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144819.664462530@linuxfoundation.org> References: <20210512144819.664462530@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shengjiu Wang [ Upstream commit 99067c07e8d877035f6249d194a317c78b7d052d ] The call sequence in wm8960_configure_clocking is ret = wm8960_configure_sysclk(); if (ret >= 0) goto configure_clock; .... ret = wm8960_configure_pll(); configure_clock: ... wm8960_configure_sysclk is called before wm8960_configure_pll, as there is bitclk relax on both functions, so wm8960_configure_sysclk always return success, then wm8960_configure_pll() never be called. With this case: aplay -Dhw:0,0 -d 5 -r 48000 -f S24_LE -c 2 audio48k24b2c.wav the required bitclk is 48000 * 24 * 2 = 2304000, bitclk got from wm8960_configure_sysclk is 3072000, but if go to wm8960_configure_pll. it can get correct bitclk 2304000. So bitclk relax condition should be removed in wm8960_configure_sysclk, then wm8960_configure_pll can be called, and there is also bitclk relax function in wm8960_configure_pll. Fixes: 3c01b9ee2ab9 ("ASoC: codec: wm8960: Relax bit clock computation") Signed-off-by: Shengjiu Wang Signed-off-by: Daniel Baluta Acked-by: Charles Keepax Link: https://lore.kernel.org/r/1614740862-30196-1-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm8960.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.30.2 diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index ceaf3bbb18e6..9d325555e219 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -608,10 +608,6 @@ static const int bclk_divs[] = { * - lrclk = sysclk / dac_divs * - 10 * bclk = sysclk / bclk_divs * - * If we cannot find an exact match for (sysclk, lrclk, bclk) - * triplet, we relax the bclk such that bclk is chosen as the - * closest available frequency greater than expected bclk. - * * @wm8960: codec private data * @mclk: MCLK used to derive sysclk * @sysclk_idx: sysclk_divs index for found sysclk @@ -629,7 +625,7 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, { int sysclk, bclk, lrclk; int i, j, k; - int diff, closest = mclk; + int diff; /* marker for no match */ *bclk_idx = -1; @@ -653,12 +649,6 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, *bclk_idx = k; break; } - if (diff > 0 && closest > diff) { - *sysclk_idx = i; - *dac_idx = j; - *bclk_idx = k; - closest = diff; - } } if (k != ARRAY_SIZE(bclk_divs)) break;