From patchwork Tue Jun 19 15:24:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 139141 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5344914lji; Tue, 19 Jun 2018 08:25:23 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJr4BKICYiWpRs497VDJXJ1QajNwueChSsZBrw+vv65q+SbidUwSrbggA4r0mLgdPeunOc/ X-Received: by 2002:adf:f811:: with SMTP id s17-v6mr13569524wrp.172.1529421923255; Tue, 19 Jun 2018 08:25:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529421923; cv=none; d=google.com; s=arc-20160816; b=QL7X+r1shS+7GQyyTe0jl2aEYHMbqvJnkzx3cGCvFiJL7qde5Pv7LaABXdiJCv74mb ezRQ+Zo2rDVQFRV4whqqpS6KCFnbRX+6qdHNwIsQsnDTyvHiHWN6C+uYb5NHjM7K3GZx cpuKSglePAdsDjweMX4isJP9yAXhFHBA5laIFT2pgFnzFHrJYQONpp2G4NbbFGgsbMk1 NNmaqaBoc4hfhbvfyGT9eIXQkB6dxUI2HTOkE7DV04L9bYnWD6JMKq5qtd8eB1dVVipc we0RM9M+JBnWDd4UQ7zA6+k2KWmQ00YIuRemQTxRpGjhcW0PrSNEyxJSmdLKsejlO1nt /SIg== 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=dZQQvzqdbdJK38aPEezgRDuNtX2Q9dHoKqJaSdxyvRo=; b=bmthcVOoJ8Ue+xjAfYvYbR0ID/OHpWFta43Jzzhy0c1NaJuLl+6Vel0SJSeg0VZvHk AjJ/db6S9mIbb9M/sBuMl0ziw78PB310GSF3j0tjH6uFkCTaQToxA+oKNDpHFZcXpq2z 8gYtyqx5WZVMaKAB25TWAK0sXlIqEWkdIBsCjL0+qD2cvLhUN398jHIA8X1YVniFhxA0 9N6WEgGJT2wUYFZV23wu9WKGKWkPL6fmNngwcGqePTPvOhPkfXnrqbpFia+xogOyK8j+ QdZVDRimuwVrTu5Rr9pzh1h44UnR7gyXCI/FIqeIp6GHy6194q9y1cnYny7AQsUEJaCn 6ubw== 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=IfIcO2Pr; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id t189-v6si287324wmg.43.2018.06.19.08.25.23; Tue, 19 Jun 2018 08:25:23 -0700 (PDT) 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=IfIcO2Pr; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 849E02676EB; Tue, 19 Jun 2018 17:24:54 +0200 (CEST) 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 25DEA2676E7; Tue, 19 Jun 2018 17:24:46 +0200 (CEST) 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, RCVD_IN_DNSWL_NONE, SPF_PASS 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 9BB412676E3 for ; Tue, 19 Jun 2018 17:24:44 +0200 (CEST) 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=tqIEI57a17vUwZUKUS2GRAEqEmUvuRsONlh/CqvcnmY=; b=IfIcO2PrYone OqT501KqMTNt3AfNFdH6hAgICrhgriwkbdNb7G4mbqQqCfQ3doSP8b41iimexnSfa4SOxDPqPMAog CMtWy7G35wua8CYPmPl4hgWes3liRhb1UMTvide5S5T56uI2ZyqnUDKQzVtOhYJCEx3iG/YcS9Mpd SKTfs=; 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 1fVIUs-0001Ld-Hy; Tue, 19 Jun 2018 15:24:42 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fVIUs-0002QE-48; Tue, 19 Jun 2018 16:24:42 +0100 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20180618182942.4925-3-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Tue, 19 Jun 2018 16:24:42 +0100 Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com, alsa-devel@alsa-project.org, broonie@kernel.org, vkoul@kernel.org Subject: [alsa-devel] Applied "ASoC: Intel: Skylake: cleanup before moving ACPI tables" 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: cleanup before moving ACPI tables 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 5f15f267daf81a4c7c2a1cd2a0d6743ec7fc8b59 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 18 Jun 2018 13:29:36 -0500 Subject: [PATCH] ASoC: Intel: Skylake: cleanup before moving ACPI tables There is no need to deal with DMICs if the DSP is not present and there is no ACPI machine ID found. Simplify before moving these ACPI tables to sound/soc/intel/common Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 _______________________________________________ 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.c b/sound/soc/intel/skylake/skl.c index 0a8f0768e987..6dec748e8949 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -500,10 +500,12 @@ static int skl_find_machine(struct skl *skl, void *driver_data) skl->mach = mach; skl->fw_name = mach->fw_filename; - pdata = skl->mach->pdata; + pdata = mach->pdata; - if (mach->pdata) + if (pdata) { skl->use_tplg_pcm = pdata->use_tplg_pcm; + pdata->dmic_num = skl_get_dmic_geo(skl); + } return 0; } @@ -930,8 +932,6 @@ static int skl_probe(struct pci_dev *pci, pci_set_drvdata(skl->pci, ebus); - skl_dmic_data.dmic_num = skl_get_dmic_geo(skl); - /* check if dsp is there */ if (bus->ppcap) { /* create device for dsp clk */