Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp982748pxb; Wed, 6 Apr 2022 06:01:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQ/mwytZwh1kriJK+WrlIbT0mj2rphhDcCJUMIrcXSTUOBI3f9u6ZSy/mrtheXFCkOp/z7 X-Received: by 2002:a92:c567:0:b0:2ca:a58:def7 with SMTP id b7-20020a92c567000000b002ca0a58def7mr4015324ilj.301.1649250074229; Wed, 06 Apr 2022 06:01:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649250074; cv=none; d=google.com; s=arc-20160816; b=Rg1euIRvPPmwdWDdsPq9eaYHgyEFsBmK0USyH9mb8oAB+6M/bVOoILkb0ATQ8gNQh5 ICNoJwu3orFelVAr/I7Mp0wE85r7t/opoGXUuuJ/4Zomtr83dsccs90EJM58tOqXW9b4 4hNQpcJhShupnH9cuM/zDashTZU9mRWQwqokOQVedKR3MxOpv4cgcae1nrCSoinspmEb 7aNP66gDdPxNJ5m8ndwrL8Xzv5/O/A0Kp3VQcuw3+ku935yJJM1a8hFu0MPnYldtj4lw oS8JAo8y/dKd64KI5I8HmuHHq4peKyvDiYu/pb0zlr4SC48kHxuIgTn1unOmsa8UGBXv VKZw== 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=kVMxQ3SJ0YSMEIvAwuxf3dOHHOP/7vGEAZ2vIZw8pEo=; b=Zy7eWUEJ9qUFMyf8qOsk1M45/RGx3u2560cVtYsG8bJUa92bdeyxx+fh9h3ZfwoOLG y2pTFK4eRY1PuR9utZ4Gd2cjPhycgEvDD2Vwcsp3JoZg+IGyOw55DXQ3TwgPlNVfQQCr GXLlJtCWfqWJjDD6Dvy+kp1fGmEPo1WWpWDvHRTXwXBeaJI2cnCrSMlYTVRaDyUiwVlr vT1vm1v+s4tfuI938yHni2waShJARo8epyzMuq9h909jASaXawnI+5BxYfHTtwwClPnJ ErctyjR6X32O5EbmGUTaXVBc/izKMgo2ouONzHE8Boo/e10oVb4Mvk/Y9ys0zndKT43t GxZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JdIKJ3D5; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id v1-20020a056638250100b0031a2a42161asi10492070jat.60.2022.04.06.06.01.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 06:01:14 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JdIKJ3D5; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B6CC957EF2E; Wed, 6 Apr 2022 03:16:23 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346541AbiDELwS (ORCPT + 99 others); Tue, 5 Apr 2022 07:52:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244830AbiDEIwm (ORCPT ); Tue, 5 Apr 2022 04:52:42 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D718420181; Tue, 5 Apr 2022 01:44:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 54A52CE1C2B; Tue, 5 Apr 2022 08:44:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69639C385A0; Tue, 5 Apr 2022 08:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148265; bh=TPCF7FNC549IoZjbuzVa2jdZC+2gUwVM/9YzXRdmpE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JdIKJ3D5OcGAX0nMV2V3NwBjPEh1SfN8tMrUHgdOEg9/Vipmf3DvZXzIkIGNFm+Ce 81KsN9GQ5W+Y8TL4jt6XsAwBk0UX/XPWJbfG0NpwL6d/WbAiAsOFI3spt7Ncr/78JI lZRPz6E20Ytlf69FNdnvpGHge0K1fmA2vcXao5So= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Hancock , Kuninori Morimoto , Mark Brown , Sasha Levin Subject: [PATCH 5.16 0293/1017] ASoC: simple-card-utils: Set sysclk on all components Date: Tue, 5 Apr 2022 09:20:06 +0200 Message-Id: <20220405070402.971354550@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Hancock [ Upstream commit ce2f7b8d4290c22e462e465d1da38a1c113ae66a ] If an mclk-fs value was provided in the device tree configuration, the calculated MCLK was fed into the downstream codec DAI and CPU DAI, however set_sysclk was not being called on the platform device. Some platform devices such as the Xilinx Audio Formatter need to know the MCLK as well. Call snd_soc_component_set_sysclk on each component in the stream to set the proper sysclk value in addition to the existing call of snd_soc_dai_set_sysclk on the codec DAI and CPU DAI. This may end up resulting in redundant calls if one of the snd_soc_dai_set_sysclk calls ends up calling snd_soc_component_set_sysclk itself, but that isn't expected to cause any significant harm. Fixes: f48dcbb6d47d ("ASoC: simple-card-utils: share asoc_simple_hw_param()") Signed-off-by: Robert Hancock Reviewed-by: Kuninori Morimoto Link: https://lore.kernel.org/r/20220120195832.1742271-5-robert.hancock@calian.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/generic/simple-card-utils.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 850e968677f1..7d8c9843ad53 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -275,6 +275,7 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream, mclk_fs = props->mclk_fs; if (mclk_fs) { + struct snd_soc_component *component; mclk = params_rate(params) * mclk_fs; for_each_prop_dai_codec(props, i, pdai) { @@ -282,16 +283,30 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; } + for_each_prop_dai_cpu(props, i, pdai) { ret = asoc_simple_set_clk_rate(pdai, mclk); if (ret < 0) return ret; } + + /* Ensure sysclk is set on all components in case any + * (such as platform components) are missed by calls to + * snd_soc_dai_set_sysclk. + */ + for_each_rtd_components(rtd, i, component) { + ret = snd_soc_component_set_sysclk(component, 0, 0, + mclk, SND_SOC_CLOCK_IN); + if (ret && ret != -ENOTSUPP) + return ret; + } + for_each_rtd_codec_dais(rtd, i, sdai) { ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, SND_SOC_CLOCK_IN); if (ret && ret != -ENOTSUPP) return ret; } + for_each_rtd_cpu_dais(rtd, i, sdai) { ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, SND_SOC_CLOCK_OUT); if (ret && ret != -ENOTSUPP) -- 2.34.1