From patchwork Tue Nov 6 17:54:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150299 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4187530ljp; Tue, 6 Nov 2018 09:54:17 -0800 (PST) X-Google-Smtp-Source: AJdET5cCHG5qLjIiRoeqgINMIoNWC332L6wENzgJjPEUVVopKI80/ThAOe9GoVu9fXkwi2zSFrlM X-Received: by 2002:a1c:a757:: with SMTP id q84-v6mr2875497wme.61.1541526857045; Tue, 06 Nov 2018 09:54:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541526857; cv=none; d=google.com; s=arc-20160816; b=NQLAHiQOcFBStnjmt30PaJC/YvdbvaVfMUZzeYp2/i5qd7jIv1/a9St12s2h7JqoaQ AFvTYCIckpTi88o5XRjCeD42b3WpJ1ZR10sglMIeOJKX0iTkCavyhJky0snmnlGM0ja6 3Eg3Ldec2MNmaoHZCRWuZVFkK6FcZzUOR6FB9EnP9mNrlUeYXciE5U4Lx1l4xA3DcVKD xWl6XEf7HFvJK6viiqZeQ8V0WBiWoU3009uCRWJ2z8qC9Sd7vA4VW4m7zbJG8WjcsIax xhW6nMfCo9gSeugGEzB1T5lxJgLi7BvbpqDrZdORJX9myJ10qwE6IV/cXHGQGKY786k2 Ql+g== 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; bh=o94fh5b1VxIL/iQY1/7VaMEsFB976dh0mNlBsBQGATQ=; b=pX6RQT1XhAValVQYUnllH9vYijuGUjGP5Dc9dh23I/OY6hCX8UjitQ8ln2ov/rNqOv p/dRDJNj4lwgvEV57IEhNXsQUP+JKff8fEpCvA7A7fs91fhjCsLqKqbTJyoqvQuoQdW+ GOideX5LcMwnaTzboalp7cF4bmiABP6NJTkW7+rxVVwH1f3Ntd4RPrUOZs/4LW09W10Z lzeuZU8KMNyVfaQEmgk4TVNIUDi77cLpR595BfBLl11Q+PAc/EWwxPr8iQgE+Pm2GEp2 WNH/YZ7A5Lc2eBClOwIGEqbw78tcfFEATCUn5kCZngAMEACRHvjyNzlWf63PUf9Un8Li cFpQ== 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=SgZ4Lsa2; 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 i14-v6si2218257wmd.76.2018.11.06.09.54.16; Tue, 06 Nov 2018 09:54:17 -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=SgZ4Lsa2; 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 0A173267A7B; Tue, 6 Nov 2018 18:54:16 +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 DF2BB267ACA; Tue, 6 Nov 2018 18:54:13 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE 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 6472B2678F2 for ; Tue, 6 Nov 2018 18:54:11 +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=yeZLegg1EsdZMVQda4A7bOOUimNwDjsQf5CJCeVKwgg=; b=SgZ4Lsa2qkvX /WHDM7e6yfB7GrYHEh9/Ca+XCJ1t7g5O32vBaqxayypNbqGggljzdPJb5Mqdp52PTUWNpk16X5a/p dfP7qYS1+P99woYtaOKehy6xtjv2gR1hBpqfJmsjKp+JneNFSfvoKVltcNoyitBZhefomfIBi7F5y RtFyc=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gK5YI-0002s1-8W; Tue, 06 Nov 2018 17:54:10 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 04E50112266B; Tue, 6 Nov 2018 17:54:10 +0000 (GMT) From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20181101213454.18894-8-pierre-louis.bossart@linux.intel.com> Message-Id: <20181106175410.04E50112266B@debutante.sirena.org.uk> Date: Tue, 6 Nov 2018 17:54:10 +0000 (GMT) Cc: alsa-devel@alsa-project.org, tiwai@suse.de, liam.r.girdwood@linux.intel.com, vkoul@kernel.org, broonie@kernel.org, andriy.shevchenko@linux.intel.com Subject: [alsa-devel] Applied "ASoC: Intel: common: add quirk for APL RVP boards" 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: common: add quirk for APL RVP boards 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 935ff8007f5efd24e995d26ebf875ee2c787465e Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Thu, 1 Nov 2018 16:34:54 -0500 Subject: [PATCH] ASoC: Intel: common: add quirk for APL RVP boards For some reason the RVP/LeafHill SSDT exposes an INT34C3 ID which is used on other boards to point to the TDF8532 amplifier. Yay BIOS. Add a DMI-quirk to ignore this ID and check for other valid machine driver descriptors. Reviewed-by: Andy Shevchenko Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- .../intel/common/soc-acpi-intel-bxt-match.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c index 2756fa4ab552..61dedc103b19 100644 --- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c @@ -6,9 +6,41 @@ * */ +#include #include #include +enum { + APL_RVP, +}; + +static const struct dmi_system_id apl_table[] = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corp."), + DMI_MATCH(DMI_BOARD_NAME, "Apollolake RVP1A"), + }, + .driver_data = (void *)(APL_RVP), + }, + {} +}; + +static struct snd_soc_acpi_mach *apl_quirk(void *arg) +{ + struct snd_soc_acpi_mach *mach = arg; + const struct dmi_system_id *dmi_id; + unsigned long apl_machine_id; + + dmi_id = dmi_first_match(apl_table); + if (dmi_id) { + apl_machine_id = (unsigned long)dmi_id->driver_data; + if (apl_machine_id == APL_RVP) + return NULL; + } + + return mach; +} + static struct snd_soc_acpi_codecs bxt_codecs = { .num_codecs = 1, .codecs = {"MX98357A"} @@ -50,6 +82,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = { { .id = "INT34C3", .drv_name = "bxt_tdf8532", + .machine_quirk = apl_quirk, .sof_fw_filename = "intel/sof-apl.ri", .sof_tplg_filename = "intel/sof-apl-tdf8532.tplg", .asoc_plat_name = "0000:00:0e.0",