From patchwork Fri May 26 20:41:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 686391 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 71934C77B73 for ; Fri, 26 May 2023 20:44:17 +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 A5FA1D8; Fri, 26 May 2023 22:43:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A5FA1D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685133849; bh=ZFbr7rgyIv06z42HHlBXVYCpuVWMAKW5RiuYXygDhX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=oGBh2t3A6DfHDVxDs2d6GPL533j3dTh7nopE6Yai3Swa2KPdCaP+o1XIycEthieG1 7wv/sUDvZ8n1AYwPFlNVtt+FmHHA9x+ye7g7nS8aFOp8aWdcuJCHFy1dMecD9R98Lr 7j3ld8XbJvKTLauxr+/v3t1NGBHm0+ket0WY12eY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C2DE5F80552; Fri, 26 May 2023 22:42:29 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1D614F80552; Fri, 26 May 2023 22:42:29 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 79E21F8026A; Fri, 26 May 2023 22:42:23 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 38371F80086 for ; Fri, 26 May 2023 22:42:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 38371F80086 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=gxI0You8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685133734; x=1716669734; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZFbr7rgyIv06z42HHlBXVYCpuVWMAKW5RiuYXygDhX0=; b=gxI0You8p5oqdqTqaCu4Qq/alqwaxQ8JHNYRgJC2tl6U1JzIg2EKIziY 252sW4iM7Uj5o2jJpm5ny+37C94CRvfqFWCwgvMMblzz4xc/zj5zrytrI WzhfYAfWiXX4nXRL5D/OPhdm34FviMBLAE+QUtnHv/mYIqwbgxYUvOiUZ spMUYWVGVZSqHG+RvGU1F/QMYAlOD0CQfR7rBlwW8Y3WUKHmFEgbPgs9e W+AZfPGIVP+SJqwlR6AF4IinA5VMQ/jMWthkQuy2lhIUfdzT+lu7fz7Dk md2+lTi4ddg4hq8R/k/sjwO7SVygouerSRdQEx/ha+nOrspk0ZS6FZuem Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="333926231" X-IronPort-AV: E=Sophos;i="6.00,195,1681196400"; d="scan'208";a="333926231" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 13:41:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="699527110" X-IronPort-AV: E=Sophos;i="6.00,195,1681196400"; d="scan'208";a="699527110" Received: from bedriarm-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.209.48.113]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 13:41:58 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Jaroslav Kysela , Ranjani Sridharan , Pierre-Louis Bossart , Bard Liao , =?utf-8?q?P=C3=A9ter_Ujfalusi?= Subject: [PATCH 1/3] ASoC: topology: Allow partial matching when finding DAI link Date: Fri, 26 May 2023 15:41:47 -0500 Message-Id: <20230526204149.456068-2-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230526204149.456068-1-pierre-louis.bossart@linux.intel.com> References: <20230526204149.456068-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: XTTDE5DY33CO2BUEKHDQQAMUC5QDS4CX X-Message-ID-Hash: XTTDE5DY33CO2BUEKHDQQAMUC5QDS4CX X-MailFrom: pierre-louis.bossart@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Ranjani Sridharan This allows for setting shorter link names in topology. For example, for the HDA Analog DAI link, just "Analog" would suffice instead of "Analog Playback and Capture" Signed-off-by: Ranjani Sridharan Signed-off-by: Pierre-Louis Bossart Reviewed-by: Bard Liao Reviewed-by: Péter Ujfalusi --- sound/soc/soc-topology.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 20fd46a41cbb..8add361e87c6 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2030,11 +2030,11 @@ static struct snd_soc_dai_link *snd_soc_find_dai_link(struct snd_soc_card *card, if (link->id != id) continue; - if (name && (!link->name || strcmp(name, link->name))) + if (name && (!link->name || !strstr(link->name, name))) continue; - if (stream_name && (!link->stream_name - || strcmp(stream_name, link->stream_name))) + if (stream_name && (!link->stream_name || + !strstr(link->stream_name, stream_name))) continue; return link; From patchwork Fri May 26 20:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 685934 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 57E06C77B7A for ; Fri, 26 May 2023 20:44:20 +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 06EAC823; Fri, 26 May 2023 22:43:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 06EAC823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685133858; bh=vf8ODbSAgf5UWt39HwG2bjF9nNF6glT8g+Rg41XQYAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rKOotJ84bqajFuzQmSgw//UUKpEKhLR4hVTgidD6pg0u0tfKke0IpngZ+FtHTLrhi p07FIC1FhZrI4vtsAeRxSGovTAf6+y8JvZVL7CSVNgGM6+oSk2mww5EVXeaAmWzt71 2S9i1Rr2lPShIGu35b6Y51SKM0kkl7Ey3LTTLtuY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A0647F80578; Fri, 26 May 2023 22:42:32 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id D440DF80567; Fri, 26 May 2023 22:42:31 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A41D3F80249; Fri, 26 May 2023 22:42:24 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 08742F8016A for ; Fri, 26 May 2023 22:42:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 08742F8016A 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=SeJuQVjM DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685133736; x=1716669736; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vf8ODbSAgf5UWt39HwG2bjF9nNF6glT8g+Rg41XQYAE=; b=SeJuQVjMgoNncbbmMzrgF4kWVpZYUnMESaAAMCkjeuFI+prUYWz6LPg/ f6zdTJD7wr876n/L6nwfWkQgQUYjUB7R6pW4BYNPaX+vfJQgIWeujzzNz ebUCurqtSmE9LdDbB43ws1uz7++cgtDy+gekhDLSa3nT+KeDCaYYtlmrD lWCBLfc6MPoXpich8xiGNimjafl8p8f20jlxg2Ru0I4JToJV0Tl1N1wjp NyxF2kk5pZCp19T1ua1kdNEqOIS3GdZqQKpxf0wLJ7HW6BV/Sl5CQaQ7f 3gMrJ7nt9ZvaNvBHS7NO8EGv/rb808z32hmYsQzJ2+8Mqq80ME9HB6Gpy w==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="333926237" X-IronPort-AV: E=Sophos;i="6.00,195,1681196400"; d="scan'208";a="333926237" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 13:42:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="699527114" X-IronPort-AV: E=Sophos;i="6.00,195,1681196400"; d="scan'208";a="699527114" Received: from bedriarm-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.209.48.113]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 13:41:59 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Jaroslav Kysela , Ranjani Sridharan , Pierre-Louis Bossart , Bard Liao Subject: [PATCH 2/3] ASoC: SOF: topology: Use partial match for connecting DAI link and DAI widget Date: Fri, 26 May 2023 15:41:48 -0500 Message-Id: <20230526204149.456068-3-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230526204149.456068-1-pierre-louis.bossart@linux.intel.com> References: <20230526204149.456068-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: E7P3B227HOJHNW2F5Y6KVA34JOBDKV35 X-Message-ID-Hash: E7P3B227HOJHNW2F5Y6KVA34JOBDKV35 X-MailFrom: pierre-louis.bossart@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Ranjani Sridharan This allows setting shorter names for the widget stream names in topology. For example, in the case of HDA Analog DAI link, the stream name is "Analog Playback and Capture". But it is enough to match "Analog" in the DAI link stream name with a widget's stream name. This is needed to set more meaningful names for the DAI widgets using the stream name in topology. Signed-off-by: Ranjani Sridharan Signed-off-by: Pierre-Louis Bossart Reviewed-by: Bard Liao --- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index f160dc454b44..698129dccc7d 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1077,7 +1077,7 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp, list_for_each_entry(rtd, &card->rtd_list, list) { /* does stream match DAI link ? */ if (!rtd->dai_link->stream_name || - strcmp(w->sname, rtd->dai_link->stream_name)) + !strstr(rtd->dai_link->stream_name, w->sname)) continue; for_each_rtd_cpu_dais(rtd, i, cpu_dai) { From patchwork Fri May 26 20:41:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 686390 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 E0974C77B73 for ; Fri, 26 May 2023 20:44:34 +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 B3B2F207; Fri, 26 May 2023 22:43:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B3B2F207 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685133872; bh=UcUy0uuB3gEPn/BnuyVmlNtkS2vacjJLk7N4UF7sLcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Cg6XLfwBVsM3P8G/JyXmSzAB4VB0REccFX5HoQm2/7kCGMHaswncdGJT6vx5T7rem u5sdjONeL+BVotKnZr0w+wB9ZrWZABuDTD+wDBVd25Y6mfa+R82WpIC78rkyLjRhVJ QxVAmkMy0pgjKhDohRAIUiVPbMquWaxBUikAXUcU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id CC61FF8057C; Fri, 26 May 2023 22:43:18 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 59B0DF8024E; Fri, 26 May 2023 22:43:18 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 11B42F80542; Fri, 26 May 2023 22:43:16 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 2866DF8024E for ; Fri, 26 May 2023 22:42:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2866DF8024E 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=TT9vXhs5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685133736; x=1716669736; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UcUy0uuB3gEPn/BnuyVmlNtkS2vacjJLk7N4UF7sLcY=; b=TT9vXhs5Quku7i00ul5h9ModK5YpEiaD0OHWZGfWgCNPVhIPSO8KRBha Bw9GtxlyJg5XuiO56kmmpAA0l8+WKEL9V4POvy09I1C6ilqPLiaMrreCn k8EsTogW78Ph5To0EJJX/xjrtj4gBBoAZEweoshZbkoPuAK6pK4O4EdBY KIlSTqmqc++t+H71gqTH9p4lq5M2jBfappKxGfi9qJVVrehADACKRuRA6 qDAxYn+Ye5HniJ1lqz0z0wWDp+Iv7+yGuKFp7xdkzSeF+N8avQ8OsjvHn JLOxIq5h5BbgQbXWOXg6JnKpKD4sLiOhILEPoOG8ramrmLDGpXqVUQdu3 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="333926244" X-IronPort-AV: E=Sophos;i="6.00,195,1681196400"; d="scan'208";a="333926244" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 13:42:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="699527115" X-IronPort-AV: E=Sophos;i="6.00,195,1681196400"; d="scan'208";a="699527115" Received: from bedriarm-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.209.48.113]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 13:42:00 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Jaroslav Kysela , Ranjani Sridharan , Pierre-Louis Bossart , Bard Liao Subject: [PATCH 3/3] ASoC: SOF: Intel: HDA: Limit the number of dai drivers for nocodec mode Date: Fri, 26 May 2023 15:41:49 -0500 Message-Id: <20230526204149.456068-4-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230526204149.456068-1-pierre-louis.bossart@linux.intel.com> References: <20230526204149.456068-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: HT7UZONDR2E6DG2IXG7DXWHXJN3ZDGYV X-Message-ID-Hash: HT7UZONDR2E6DG2IXG7DXWHXJN3ZDGYV X-MailFrom: pierre-louis.bossart@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Ranjani Sridharan With a common kernel config for nocodec and codec modes, the number of DAI drivers will be set to 15 for nocodec as well. So adjust this when set the machine params for the nocodec mode if the debug flag is set. Signed-off-by: Ranjani Sridharan Signed-off-by: Pierre-Louis Bossart Reviewed-by: Bard Liao --- sound/soc/sof/intel/hda.c | 6 +++++- sound/soc/sof/intel/hda.h | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 3153e21f100a..835c2568dd60 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -1562,7 +1562,11 @@ void hda_set_mach_params(struct snd_soc_acpi_mach *mach, mach_params = &mach->mach_params; mach_params->platform = dev_name(sdev->dev); - mach_params->num_dai_drivers = desc->ops->num_drv; + if (IS_ENABLED(CONFIG_SND_SOC_SOF_NOCODEC_DEBUG_SUPPORT) && + sof_debug_check_flag(SOF_DBG_FORCE_NOCODEC)) + mach_params->num_dai_drivers = SOF_SKL_NUM_DAIS_NOCODEC; + else + mach_params->num_dai_drivers = desc->ops->num_drv; mach_params->dai_drivers = desc->ops->drv; } diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 65832a38bffa..5b3dad2dadf4 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -414,10 +414,12 @@ (HDA_DSP_BDL_SIZE / sizeof(struct sof_intel_dsp_bdl)) /* Number of DAIs */ +#define SOF_SKL_NUM_DAIS_NOCODEC 8 + #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) #define SOF_SKL_NUM_DAIS 15 #else -#define SOF_SKL_NUM_DAIS 8 +#define SOF_SKL_NUM_DAIS SOF_SKL_NUM_DAIS_NOCODEC #endif /* Intel HD Audio SRAM Window 0*/