From patchwork Wed May 17 09:51:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 104370 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp149717qge; Wed, 17 May 2017 02:51:36 -0700 (PDT) X-Received: by 10.223.154.240 with SMTP id a103mr1550143wrc.5.1495014696004; Wed, 17 May 2017 02:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495014695; cv=none; d=google.com; s=arc-20160816; b=b3pGlbKAC/ftsIFEMLpf0LVYO9DBqNR/NoLfoCofUO7/Aou2mx7nv47ATPttX9uEim nclKDdYajkypFzB2Bgqg6BWoONRwEixjpsfjxeXSvCq4UK9MlVLUKsOYUrBPLD5P9fF7 rsHLxJnMB1BLU+gNxNBPxPwoSOAQr78J4cZdSui02sAnfxuu2CvALfnnWS0Uxh3ccou3 JBHpKAyI+dLr+hgclntEZJfCdGaFtXVzqLFIiVTPzNCni6iNRHwivHHs7ETscgXetX+8 YBQo4+gz3Nl4NsxMvtg889HS7nou7eFiQw9FRLC8tkQqCALwFKjRgnJRGZZD86zB1sI6 ky6w== 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 :delivered-to:arc-authentication-results; bh=xw/VHmbztUmmrzY+dbCiQtvr9x52AmWBGOEHwIfPyEg=; b=VqROZ5es6/npF9MQFEiGKZgUdLe1dzp2rBFII3j2Os+9ZTOURh70Y4F5IU981ntAKr JuLKFFhMLfbuLiZn19z2f9Wb89kS790FC1pg8Pw7vxCA9xh86lKs60QYXzY3EAq2suoE A8btWhahDsYdw8BvuCYIJpY6t4jkrGLF/0JCJnIis0HiDysFlkvBUhfTS6pcY8pfueHf 14i99aVBCvKiHA+30yF/Q9Ftun4b7IYMphwcnNsDVeub9BgxiDksU3MS+TfdCz/uFPm1 IrMGyWID+mwwTjiqsxSUNikjSrxye/VnROqiMN1GWnHblunO0CY2iEJjGAeOZWqp4g/A 3gSQ== ARC-Authentication-Results: i=1; mx.google.com; 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 r14si1599447wrc.97.2017.05.17.02.51.35; Wed, 17 May 2017 02:51:35 -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; 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 72B5C267065; Wed, 17 May 2017 11:51:33 +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 A87EC2664EB; Wed, 17 May 2017 11:51:31 +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.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id A6DE72664EB for ; Wed, 17 May 2017 11:51:29 +0200 (CEST) Received: from [2001:470:1f1d:6b5::3] (helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dAvc2-0002Vp-S9; Wed, 17 May 2017 09:51:25 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dAvby-0006eE-Ul; Wed, 17 May 2017 10:51:18 +0100 From: Mark Brown To: Oder Chiou In-Reply-To: <1494846127-9008-1-git-send-email-oder_chiou@realtek.com> Message-Id: Date: Wed, 17 May 2017 10:51:18 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: jack.yu@realtek.com, alsa-devel@alsa-project.org, lgirdwood@gmail.com, broonie@kernel.org, shumingf@realtek.com, bardliao@realtek.com, Hsin-Yu Chao , flove@realtek.com Subject: [alsa-devel] Applied "ASoC: rt5514: Add ACPI match ID" 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: rt5514: Add ACPI match ID has been applied to the asoc tree at git://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 6d3edf866ffa7a9348cfc30d9f58270e4f8d068e Mon Sep 17 00:00:00 2001 From: Oder Chiou Date: Mon, 15 May 2017 19:02:07 +0800 Subject: [PATCH] ASoC: rt5514: Add ACPI match ID This patch adds the ACPI match ID for rt5514 codec. Signed-off-by: Hsin-Yu Chao Signed-off-by: Oder Chiou Signed-off-by: Mark Brown --- sound/soc/codecs/rt5514.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index ff97360c03db..5c30c4d64ebe 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ +#include #include #include #include @@ -1095,6 +1096,14 @@ static const struct of_device_id rt5514_of_match[] = { MODULE_DEVICE_TABLE(of, rt5514_of_match); #endif +#ifdef CONFIG_ACPI +static struct acpi_device_id rt5514_acpi_match[] = { + { "10EC5514", 0}, + {}, +}; +MODULE_DEVICE_TABLE(acpi, rt5514_acpi_match); +#endif + static int rt5514_parse_dt(struct rt5514_priv *rt5514, struct device *dev) { device_property_read_u32(dev, "realtek,dmic-init-delay-ms", @@ -1198,6 +1207,7 @@ static const struct dev_pm_ops rt5514_i2_pm_ops = { static struct i2c_driver rt5514_i2c_driver = { .driver = { .name = "rt5514", + .acpi_match_table = ACPI_PTR(rt5514_acpi_match), .of_match_table = of_match_ptr(rt5514_of_match), .pm = &rt5514_i2_pm_ops, },