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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id BD126C004D4 for ; Thu, 19 Jan 2023 16:37:55 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E46CF1845; Thu, 19 Jan 2023 17:37:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E46CF1845 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674146274; bh=HxV5zQCyIwGcc1YmaKK2RK+6HCKKnTbtX67my7ax6HE=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=Q2jppiad7Ceg+AA6T+vi6ExsbFxPgCslUCtByRFuTjmufTLRughRLf6lCfREiCYiK Tl8Ul2YyE1wCkmJVRVRf71DeaByY2/Kg76csLzmYyESeMMY+fBtK8RHqsUAhiO2ADF v5lQKKhZo/eyM87MGM9MqjSdq13C8yksGmuesyRU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 601BDF80549; Thu, 19 Jan 2023 17:36:15 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F3A44F804E6; Thu, 19 Jan 2023 17:36:10 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C5A50F80083 for ; Thu, 19 Jan 2023 17:36:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C5A50F80083 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Mp+60Z0z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674146170; x=1705682170; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HxV5zQCyIwGcc1YmaKK2RK+6HCKKnTbtX67my7ax6HE=; b=Mp+60Z0z5b5Jvi9PP0CpXfwq4bQBHMyvcXqemry4l4lGxywary3OSWtf upH5o0DklKSNv5DWXApdiRoXNboVk7f+ZsFa9EfmaR8Wz3XKXikRmtKQD /7lryvVBcqIabHA0l2J2F0Xesa+niIowyS4jdIYIvrGT+zq/OZ8ivUZzH 0d2iuShi2YGEvs+3qcbTXblMi0Xgejc+/QoV5g327wMWGRuNJ6Eb5FXYg xOCHSE7PAVcy/741ACr8moaIoJKFwgywvgYCbz44KjnF6x9DAR9zVqxIE Yok0Zva/TJjdYZXcO/6iEwRrMFouCs1Np/uZr3nw7FxhpPhfNWZChBn09 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="323029634" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="323029634" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 08:36:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="662163098" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="662163098" Received: from eliteleevi.tm.intel.com ([10.237.54.20]) by fmsmga007.fm.intel.com with ESMTP; 19 Jan 2023 08:36:06 -0800 From: Kai Vehmanen To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH 4/4] ASoC: Intel: sof_ssp_amp: always set dpcm_capture for amplifiers Date: Thu, 19 Jan 2023 18:34:59 +0200 Message-Id: <20230119163459.2235843-5-kai.vehmanen@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119163459.2235843-1-kai.vehmanen@linux.intel.com> References: <20230119163459.2235843-1-kai.vehmanen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 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: , Cc: kai.vehmanen@linux.intel.com, yung-chuan.liao@linux.intel.com, lgirdwood@gmail.com, peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, daniel.baluta@nxp.com Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Pierre-Louis Bossart 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 --- sound/soc/intel/boards/sof_ssp_amp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/sof_ssp_amp.c b/sound/soc/intel/boards/sof_ssp_amp.c index f75800d9d6de..ffd9c583dab1 100644 --- a/sound/soc/intel/boards/sof_ssp_amp.c +++ b/sound/soc/intel/boards/sof_ssp_amp.c @@ -254,13 +254,12 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, sof_rt1308_dai_link(&links[id]); } else if (sof_ssp_amp_quirk & SOF_CS35L41_SPEAKER_AMP_PRESENT) { cs35l41_set_dai_link(&links[id]); - - /* feedback from amplifier */ - links[id].dpcm_capture = 1; } links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].dpcm_playback = 1; + /* feedback from amplifier or 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