From patchwork Thu Nov 30 12:32:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120168 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp606620qgn; Thu, 30 Nov 2017 04:33:03 -0800 (PST) X-Google-Smtp-Source: AGs4zMYbfKOLAsZR0KUOeCxE7I++OR6ksUBEc0C1Q7H+hZJtHr4GzWq7diDIuRsC7tutOXVplol3 X-Received: by 10.28.65.65 with SMTP id o62mr505785wma.112.1512045183488; Thu, 30 Nov 2017 04:33:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512045183; cv=none; d=google.com; s=arc-20160816; b=Gr3kFZ/IGVgm0KFb3nEtN2HGUVwDo7mbyHcoI5RQpowM0aMfQF1eDjPWRb0vthRPSb sFoax5pFuJxKnJl7QOSH6CUbzfDEmxMIhxVYzIj/JD+7PKgB8i0oR10764kM5Bk5zws9 Ny1du2PzEQpxorG4Od62HEzRSUzClKNOT8BVQqn29Y+QAcbVDoTeFtODUa7k+QDa1A1s bf/vDzTChSvMwyIaacrjGMTtFjYlOQCEz3C6XTpQloj2EkiFLdhe71r8QDP63uthPgxP wnrSVRRd+SNWuTaZcA7+5iBUfc6AELppAuz8tYi8caId+3QlL8tm7TWIKEJ+j/e1kUwm L1/w== 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=WK7yN0dad+wXwwT/+79XSlrwByQagEYjLx3jFxBKWpg=; b=lLpwhjaoaMaJYj0vvMLS4DrtpGfB4BWuEqK5a4w1Jfh+FGedeamnwE97JW2PUyH10y ocvACQGLq4Vg45E7XWE2QgO6uepioyJjWehiU80P5T+TVB+HvGpZWnRf2MPNtzWIfN1Z wQCPR/mbzffL8oy9vN+rF/ZSQ+ENtB7DP0fIU0RJEHHtuX00Qqm2bDuwDQevjXpKeKX0 0yG3g8Fb8O0oZsIe6eeT0Ph5ckT2XaICJbwC2Ru/tMMWwQrR7D9BJZEiwitLxPSAZEuG CqCbslurWRvehnYDM+tzW2q8RmNJvfsyRCOagvXpw0mn4Avwfj553EWdzrQgyi/vktUL t4qw== 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=rHOykxyu; 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 5si3142729wmg.226.2017.11.30.04.33.03; Thu, 30 Nov 2017 04:33:03 -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=rHOykxyu; 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 B88F52679C1; Thu, 30 Nov 2017 13:32:58 +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 596712679C1; Thu, 30 Nov 2017 13:32:57 +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, 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 216BF2679BE for ; Thu, 30 Nov 2017 13:32:55 +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=QodQWinfbbqC9x6uD8DJiYG2ukXjfdWUy+g2MlK7qBY=; b=rHOykxyu6nJm IEtIxDxawop6KRwA7/vni0NdN6sczAghbOWo9khO5FtHm+OZGkEp5dvQkF5nAYrAe8TvzA37eWs7B q7yBQvLzX+RLpEenvlwb+1QRrE2BR7i6W8s26IIwzrKzwcfaTCuG/TDxsKFcs+b1VPqHVxLALX7wH 2FJLI=; 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 1eKO1K-0003Fo-S2; Thu, 30 Nov 2017 12:32:50 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eKO1K-0000S4-EY; Thu, 30 Nov 2017 12:32:50 +0000 From: Mark Brown To: Andrew F. Davis In-Reply-To: <20171129213300.20021-4-afd@ti.com> Message-Id: Date: Thu, 30 Nov 2017 12:32:50 +0000 Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Tony Lindgren , Liam Girdwood , Rob Herring , linux-kernel@vger.kernel.org, Mark Brown , =?utf-8?q?Beno=C3=AEt_Cousson?= , "Andrew F . Davis" Subject: [alsa-devel] Applied "ASoC: tlv320aic31xx: Move ACPI table next to OF table" 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: tlv320aic31xx: Move ACPI table next to OF table 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 09303601bacda714220048a61f6864f88594b231 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Wed, 29 Nov 2017 15:32:44 -0600 Subject: [PATCH] ASoC: tlv320aic31xx: Move ACPI table next to OF table Signed-off-by: Andrew F. Davis Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320aic31xx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 0563a49cc5e4..d974e8651e30 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1285,6 +1285,14 @@ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx) } #endif /* CONFIG_OF */ +#ifdef CONFIG_ACPI +static const struct acpi_device_id aic31xx_acpi_match[] = { + { "10TI3100", 0 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match); +#endif + static int aic31xx_device_init(struct aic31xx_priv *aic31xx) { int ret, i; @@ -1382,14 +1390,6 @@ static const struct i2c_device_id aic31xx_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id); -#ifdef CONFIG_ACPI -static const struct acpi_device_id aic31xx_acpi_match[] = { - { "10TI3100", 0 }, - { } -}; -MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match); -#endif - static struct i2c_driver aic31xx_i2c_driver = { .driver = { .name = "tlv320aic31xx-codec",