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 X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50E20C433DB for ; Thu, 25 Mar 2021 11:39:12 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E1F961A0A for ; Thu, 25 Mar 2021 11:39:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E1F961A0A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 203C816BC; Thu, 25 Mar 2021 12:38:20 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 203C816BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1616672350; bh=A4B6XbbT7KvxAU19tiURSpZujePNokG7twiWWsRMR8o=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=PSaaA7v/PTcos1boZxO5NA1lbD7+lqlvLN9ZrSXsI2zmuTK0gjSwkyEScrthxzH7X lcs6zmekcY/GyU2WqicePSf9aHkvLfOi8VEmq3u+zmC/M9+hNdcASJlVVPCfvQyH5K ZehU5mJo/hT76MjRLPaoO+Ec7HW3UB6OuLZAZD3Y= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 4377EF805C5; Thu, 25 Mar 2021 12:27:39 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B5DA7F805A1; Thu, 25 Mar 2021 12:27:26 +0100 (CET) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5EF24F80564 for ; Thu, 25 Mar 2021 12:27:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5EF24F80564 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nRhY5nF6" Received: by mail.kernel.org (Postfix) with ESMTPSA id C797661A49; Thu, 25 Mar 2021 11:27:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616671639; bh=A4B6XbbT7KvxAU19tiURSpZujePNokG7twiWWsRMR8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nRhY5nF6TqbzR7lbQo9Our3TvV4ZLWKyRPWcBj7H/jyS8v9mm3HD6HKRtQczMIYvP 1O9CtcIJoyPJoBGdDHwNTTRZbtzlkIQBumPBUGC2QxtPQ+q0PfaPbmD8QJ5utD4BrU kVSmwr0zJGVXz2TPB+WcvQcH12DS8UpnU2rhUOPB+L5IW+9PyXLaR4zyIdBtO4qmkX SqjRQWHxhst6d3WpgyHmuOc1vw0ENC+f0WMh+WdMFV07vdwHwN27ywUkQINggJlc8z q3RveRb6w1IpokxxlW6JaGh/x7cw15niZPqoEUp5KObk9GC4ys0OO+rZ0GdcJtM/p1 zll0VMmTmtQtw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 21/24] ASoC: rt5659: Update MCLK rate in set_sysclk() Date: Thu, 25 Mar 2021 07:26:47 -0400 Message-Id: <20210325112651.1927828-21-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210325112651.1927828-1-sashal@kernel.org> References: <20210325112651.1927828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Cc: Sasha Levin , Sameer Pujar , Mark Brown , Michael Walle , alsa-devel@alsa-project.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Sameer Pujar [ Upstream commit dbf54a9534350d6aebbb34f5c1c606b81a4f35dd ] Simple-card/audio-graph-card drivers do not handle MCLK clock when it is specified in the codec device node. The expectation here is that, the codec should actually own up the MCLK clock and do necessary setup in the driver. Suggested-by: Mark Brown Suggested-by: Michael Walle Signed-off-by: Sameer Pujar Link: https://lore.kernel.org/r/1615829492-8972-3-git-send-email-spujar@nvidia.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt5659.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index e66d08398f74..afd61599d94c 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -3463,12 +3463,17 @@ static int rt5659_set_component_sysclk(struct snd_soc_component *component, int { struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); unsigned int reg_val = 0; + int ret; if (freq == rt5659->sysclk && clk_id == rt5659->sysclk_src) return 0; switch (clk_id) { case RT5659_SCLK_S_MCLK: + ret = clk_set_rate(rt5659->mclk, freq); + if (ret) + return ret; + reg_val |= RT5659_SCLK_SRC_MCLK; break; case RT5659_SCLK_S_PLL1: -- 2.30.1