Message ID | 20210204203312.27112-9-pierre-louis.bossart@linux.intel.com |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=grW5=HG=alsa-project.org=alsa-devel-bounces@kernel.org> 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 967FBC433E0 for <alsa-devel@archiver.kernel.org>; Thu, 4 Feb 2021 20:38:08 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D6B3864F59 for <alsa-devel@archiver.kernel.org>; Thu, 4 Feb 2021 20:38:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6B3864F59 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2A7381683; Thu, 4 Feb 2021 21:37:16 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2A7381683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1612471086; bh=d8KaIN8Qj4Q1MAT4zPdG0Zjw88RjmF+aPz0m8+X2mCs=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=YoxkZ7paJqv3hSqcz9fXSTAoC9N31S2YwbFMXE2WdVEBTxCECtwrg3irk8MFKfD4C tbnujNcGdQQBTxPdCnabibqS3kpffD4rDKxhpa40XQPyvW/BhtLDB9vnMK+OI5iIaf rIaEgDD2yihFfOFCn/QDcVQOKFZlSDl8GLSCi8PM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B3751F80482; Thu, 4 Feb 2021 21:34:09 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1D3FFF80275; Thu, 4 Feb 2021 21:33:58 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 3625DF8025D for <alsa-devel@alsa-project.org>; Thu, 4 Feb 2021 21:33:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3625DF8025D IronPort-SDR: Dl75vKFbKYrApeGaScIBWDVVJkYlNq03zSD8cbxX6+aytiNlOGWfQUDJrnBW5N+EGPtPJexcUp 4+xLKhSWvQ2g== X-IronPort-AV: E=McAfee;i="6000,8403,9885"; a="181472514" X-IronPort-AV: E=Sophos;i="5.81,153,1610438400"; d="scan'208";a="181472514" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 12:33:49 -0800 IronPort-SDR: RCOAoX3oXcIP1f3hX9atTqY9ob/A2BzvSvMDJEW3pIxVGdKY+RpP0I10p/+IRRB/Hj4WQ4lzD0 EKX/9HfipOoQ== X-IronPort-AV: E=Sophos;i="5.81,153,1610438400"; d="scan'208";a="483700333" Received: from jdasilva-mobl.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.209.66.22]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 12:33:48 -0800 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: alsa-devel@alsa-project.org Subject: [PATCH 08/14] ASoC: Intel: sof_sdw: detect DMIC number based on mach params Date: Thu, 4 Feb 2021 14:33:06 -0600 Message-Id: <20210204203312.27112-9-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210204203312.27112-1-pierre-louis.bossart@linux.intel.com> References: <20210204203312.27112-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: tiwai@suse.de, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, vkoul@kernel.org, broonie@kernel.org, Rander Wang <rander.wang@intel.com>, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com>, Bard Liao <bard.liao@intel.com> X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" <alsa-devel.alsa-project.org> List-Unsubscribe: <https://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <https://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" <alsa-devel-bounces@alsa-project.org> |
Series |
ASoC: SOF/Intel/SoundWire: add missing quirks and DMIC support
|
expand
|
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index d1251a6ac3af..06f07dd45fb4 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -955,7 +955,7 @@ static int sof_card_dai_links_create(struct device *dev, ctx->idisp_codec = true; /* enable dmic01 & dmic16k */ - dmic_num = (sof_sdw_quirk & SOF_SDW_PCH_DMIC) ? 2 : 0; + dmic_num = (sof_sdw_quirk & SOF_SDW_PCH_DMIC || mach_params->dmic_num) ? 2 : 0; comp_num += dmic_num; dev_dbg(dev, "sdw %d, ssp %d, dmic %d, hdmi %d", sdw_be_num, ssp_num,