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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 97D1DC433DF for ; Thu, 20 Aug 2020 12:49:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E20822D02 for ; Thu, 20 Aug 2020 12:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597927785; bh=bk/x8Y10EKdsRTQUjwNWHxsSDrm6J2y97JLT8GSLSUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UYewcl9AXHF0d9oXs6T9jDuJ2Go6WYWcQMf4CEdiEbHCiufkjcESmhg9QiPf7R3qd o7PYA9WGrA9ilb+auYTYSzeqWxT0UMvSOfq2iACpX8p78Rfnlzm7wHXMkEm5zMWMRO YEpTvMtN9JX3p8FJaIMraK+yCyMMRrVPBrg+Eovw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729821AbgHTMtm (ORCPT ); Thu, 20 Aug 2020 08:49:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:42314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728982AbgHTJpQ (ORCPT ); Thu, 20 Aug 2020 05:45:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2BCDD22D02; Thu, 20 Aug 2020 09:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597916661; bh=bk/x8Y10EKdsRTQUjwNWHxsSDrm6J2y97JLT8GSLSUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=16k6JOYfwu4KjWiIyVjp0EB4EM25AB+lAXEpyoVZ9MqmWManCDyDOUohKCiLX2Jzy aJFl2bg+bG4/+fNnN69O3+xuF/qxxywMumVj/rMmiU7VQahhlO7DeK9WVP62Kmx/dk cahWtR5cWnV0NJquHID/a5zdZhEOjc7lDplVzKUQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sowjanya Komatineni , Dmitry Osipenko , Thierry Reding Subject: [PATCH 5.7 192/204] ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init() Date: Thu, 20 Aug 2020 11:21:29 +0200 Message-Id: <20200820091615.784375033@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091606.194320503@linuxfoundation.org> References: <20200820091606.194320503@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sowjanya Komatineni commit ff5d18cb04f4ecccbcf05b7f83ab6df2a0d95c16 upstream. Tegra PMC clock clk_out_1 is dedicated for audio mclk from Tegra30 through Tegra210 and currently Tegra clock driver keeps the audio mclk enabled. With the move of PMC clocks from clock driver into pmc driver, audio mclk enable from clock driver is removed and this should be taken care of by the audio driver. tegra_asoc_utils_init() calls tegra_asoc_utils_set_rate() and audio mclk rate configuration is not needed during init and the rate is actually set during the ->hw_params() callback. So, this patch removes tegra_asoc_utils_set_rate() call and just leaves the audio mclk enabled. Signed-off-by: Sowjanya Komatineni Tested-by: Dmitry Osipenko Reviewed-by: Dmitry Osipenko Signed-off-by: Thierry Reding Signed-off-by: Greg Kroah-Hartman --- sound/soc/tegra/tegra_asoc_utils.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c @@ -205,9 +205,16 @@ int tegra_asoc_utils_init(struct tegra_a data->clk_cdev1 = clk_out_1; } - ret = tegra_asoc_utils_set_rate(data, 44100, 256 * 44100); - if (ret) + /* + * FIXME: There is some unknown dependency between audio mclk disable + * and suspend-resume functionality on Tegra30, although audio mclk is + * only needed for audio. + */ + ret = clk_prepare_enable(data->clk_cdev1); + if (ret) { + dev_err(data->dev, "Can't enable cdev1: %d\n", ret); return ret; + } return 0; }