From patchwork Wed Dec 6 17:49:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120881 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp7349583qgn; Wed, 6 Dec 2017 09:50:11 -0800 (PST) X-Google-Smtp-Source: AGs4zMZGRuaVgiXpirKaLupBGKdrT+xD4/QyPB56HLrWJu2t18KR9d0L9ikRsG70axz2Bm7iW6Mk X-Received: by 10.223.160.40 with SMTP id k37mr19676788wrk.66.1512582611726; Wed, 06 Dec 2017 09:50:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512582611; cv=none; d=google.com; s=arc-20160816; b=SZacgi/CFGY5SBovJUdkBJsXfvLOLOfSpHuEktjqbAq6tM6KSe60OAXQBYY+MJk7A1 aIR+JvEmWjdZme/ouoo4D2G2VJ8ZGhHLNx2ARqlcte+zMfxVGWKjhkYJ4W0J50OgSOEI u3RCIIwSAIcXretNDqr5NbS3DVdoTz65kPcG9A39y+glzLR5tUJT7y31H5ARl3mf7laN D0NFQ0tk1WffvCrTzbpI+DfLzFs8nRdopfI2pUNzIDZLQJt73fMwITPaQgvkgOARYX69 M2JeyJvl5z2zzD1dAIUykiQ5DtWAZTygaJy4BfRU8TlxqjKwSl8yEbkpalp/fMS80z6j AKBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=uit4f+SQCIZF1GbfnKP/zidTDcOgdo2WBp83u3mb4+w=; b=qbjOtcrP7BXUrGhZvzxrX5G96I3c9rKxgn1KBw7PJM16+4pec3B5DvwRggDKPeab88 mjJz/WLmxNCMT87hsKFklzTujXXDIou7hhQlTAMb1sm3pxfnzF6GQKqVMTrie01gFz4N NanAj8QcDolMvYrjzGLF4KOygF6lOPTR34t0RibeIrWzrRuYLvdaujmGIEPEg5pLbByF T4ucfUk47WRYjNgl48n0ZtAmfvD1WxDavvtjFLf0tlq/FlZZib2ajw5PGqz2rgMjlLsL gw2uOKA0HoSQAydqJSzD2+HfInX/mqIhqNsWUJddq7TSbJOl8rieawVH6IP7wET4VXBF FPyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=A4A3Mqnb; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 64si2467421wri.143.2017.12.06.09.50.11; Wed, 06 Dec 2017 09:50:11 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=A4A3Mqnb; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 16131267A2C; Wed, 6 Dec 2017 18:49:26 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 88A94267A26; Wed, 6 Dec 2017 18:49:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 49F4A267A1F for ; Wed, 6 Dec 2017 18:49:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=NCRcgMI51NwbshpuYxoh2WjHs1HdUe1HDSXBB3p/1Ys=; b=A4A3MqnblB7X MCTYhG+kmpFgPCRzroUnGyOVPk+XWlwAfpSWLqZFxER6q8gm+1eMyqXFb0MUk5tA6Xi6ePuSLspap Kgb/2an98wvS1ukbe/9LYVuvkLLqKuQfGustuOvo//qOw9gpi8vNlv0kbIHrRfiL//c87LTqS6ZnT wgDus=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eMdom-0002rz-6J; Wed, 06 Dec 2017 17:49:12 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eMdol-0004kq-JX; Wed, 06 Dec 2017 17:49:11 +0000 From: Mark Brown To: Guneshwor Singh In-Reply-To: <20171206110406.11400-5-guneshwor.o.singh@intel.com> Message-Id: Date: Wed, 06 Dec 2017 17:49:11 +0000 Cc: alsa-devel@alsa-project.org, Takashi Iwai , Patches Audio , Liam Girdwood , Vinod Koul , Mark Brown Subject: [alsa-devel] Applied "ASoC: Intel: Skylake: Do not check dev_type for dmic link type" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: Intel: Skylake: Do not check dev_type for dmic link type has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From e02b03303f13b6a571f01b4d84b69440696d2dde Mon Sep 17 00:00:00 2001 From: Guneshwor Singh Date: Wed, 6 Dec 2017 16:34:04 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Do not check dev_type for dmic link type Some BIOS have inconsistent dev_type value for DMIC link type. Since there is only one device type for DMIC link type, remove device type check if link type is NHLT_LINK_DMIC. Signed-off-by: Guneshwor Singh Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl-nhlt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- 2.15.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index d14c50a60289..3eaac41090ca 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -119,11 +119,16 @@ static bool skl_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt, if ((epnt->virtual_bus_id == instance_id) && (epnt->linktype == link_type) && - (epnt->direction == dirn) && - (epnt->device_type == dev_type)) - return true; - else - return false; + (epnt->direction == dirn)) { + /* do not check dev_type for DMIC link type */ + if (epnt->linktype == NHLT_LINK_DMIC) + return true; + + if (epnt->device_type == dev_type) + return true; + } + + return false; } struct nhlt_specific_cfg