Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8286FC05027 for ; Thu, 9 Feb 2023 11:15:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230082AbjBILPl (ORCPT ); Thu, 9 Feb 2023 06:15:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbjBILP2 (ORCPT ); Thu, 9 Feb 2023 06:15:28 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E97855E64; Thu, 9 Feb 2023 03:15:19 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 02721B820FC; Thu, 9 Feb 2023 11:15:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28B88C433D2; Thu, 9 Feb 2023 11:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675941316; bh=e5xKhM6EHuypLaXFIb6K7TSOUUobBXtWAZExTQ7ruVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=prCjN49MtYINqZnzcQX+2Wsbyq3EwqvI4xYEV7sVce6cafUgFiYJZWy/aQX2LrPxZ AM7jl3WflQ7WXNJIKcs4UQxoXXdJzLFgIk30BnWBW5N78kAbNqwmcKBDRHh2UlvTUx QnD03ycKtdRtR9owsay9eTGNf4PuWAdGdd9h+mFSKwfu+mkPZQzNTGMQM6WfwIDKVw X/mDGvOssObi8LtQDoVx9i+SB486ebLaNMvmBuQx47gpxO0UnefELsN21Z+lfvb5Bb 4L8GQnA3gQWP7IZFs6XB8rIxArpkdYk89Mw7q1sYQ7ktwlh5atp5jtXVinwDw0JCBo RIRbxKfAGFs0A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pierre-Louis Bossart , Ranjani Sridharan , =?UTF-8?q?P=C3=A9ter=20Ujfalusi?= , Bard Liao , Kai Vehmanen , Mark Brown , Sasha Levin , cezary.rojewski@intel.com, liam.r.girdwood@linux.intel.com, perex@perex.cz, tiwai@suse.com, brent.lu@intel.com, akihiko.odaki@gmail.com, ye.xingchen@zte.com.cn, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 6.1 05/38] ASoC: Intel: sof_cs42l42: always set dpcm_capture for amplifiers Date: Thu, 9 Feb 2023 06:14:24 -0500 Message-Id: <20230209111459.1891941-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230209111459.1891941-1-sashal@kernel.org> References: <20230209111459.1891941-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart [ Upstream commit e0a52220344ab7defe25b9cdd58fe1dc1122e67c ] The amplifier may provide hardware support for I/V feedback, or alternatively the firmware may generate an echo reference attached to the SSP and dailink used for the amplifier. To avoid any issues with invalid/NULL substreams in the latter case, always unconditionally set dpcm_capture. Link: https://github.com/thesofproject/linux/issues/4083 Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Péter Ujfalusi Reviewed-by: Bard Liao Signed-off-by: Kai Vehmanen Link: https://lore.kernel.org/r/20230119163459.2235843-3-kai.vehmanen@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/sof_cs42l42.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c index e38bd2831e6ac..e9d190cb13b0a 100644 --- a/sound/soc/intel/boards/sof_cs42l42.c +++ b/sound/soc/intel/boards/sof_cs42l42.c @@ -336,6 +336,9 @@ static int create_spk_amp_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); links[*id].dpcm_playback = 1; + /* firmware-generated echo reference */ + links[*id].dpcm_capture = 1; + links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1; -- 2.39.0