From patchwork Tue Dec 5 12:46:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120643 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5701574qgn; Tue, 5 Dec 2017 04:46:51 -0800 (PST) X-Google-Smtp-Source: AGs4zMaadXdCOAiMW7n4BtWq8y2ec8laEMqUxcaYPnqCN/T1oRy6vkEm0EANiwwDaaOWMyrXsURo X-Received: by 10.28.70.66 with SMTP id t63mr9422809wma.106.1512478011273; Tue, 05 Dec 2017 04:46:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512478011; cv=none; d=google.com; s=arc-20160816; b=GQK80uTV34oB6UcEYpCMoF6V0hIHrtbMjEeNi+rLrLIVVlC8LICYN88w3ClL+uvf8V eKLrpplJFT8+Ysk/KkK+TW2U4e3ySMVAI/a6/ENp1ispWhQlSQ/fk/NgCCmfV1KJTglc 2fWpLRsXNfN3FqSB0MIQrehNYDHeyQUINiPeHd7zrIDbXi4zPiKvTnwj5dFkRVv9aQEp GsrHCo8UBK3ufiA/8Lb/SNN2bUXlqOYZnpVobpSBrN42BhInGqDqSg2aQR8z8GHrgyBB GKznzCECJSbGfB27MP95Pipt2kRwAjsKT2t5pojeIgmxK6eQLJ1q2enNI5QHBufdqwam P6Rw== 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=ZRt9tpePocZBTD8rr5G99hrCTy1HXXU2rSaFeocPS5E=; b=ZuxYCSnsN24YqVAxE69sRemBIIwgIf15UL/kxGxT5YCZ4jCj326zu0+POHeztQQ+9V Z95rnL8Iu6aD6TSP8X9DaVsgrbT7rLovt6g/dE8PTO3KzDUmhukhghiPzQC93Ycw+iJP lr6y5s2W3QniqzcuGHI8vJj+tAG2s88iw5i4EdOvDu4rE7F4yvq0hHdi9GH3R+33xmpN Hd+4R0mICk8vDXVIkCpgaea567Cx7ELRN2SuMbsUy563h+Y1+3CP1l50dwuNKR16wLqb hCTCI+EJSVEH4D+yL/9NUfCrc1e9lPLFj+oR/uAuuidWwR60Lv9RD8lE43WbEP4M4CAy ECxA== 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=hptdf4Yn; 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 j126si223832wmj.177.2017.12.05.04.46.51; Tue, 05 Dec 2017 04:46:51 -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=hptdf4Yn; 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 C30FC26772D; Tue, 5 Dec 2017 13:46:49 +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 812F7267602; Tue, 5 Dec 2017 13:46:47 +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 E815026772D for ; Tue, 5 Dec 2017 13:46:41 +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=8qi0TOpZmrdcrbjzB0Bh5Bri9JsMAL9CBk4km4IfeP4=; b=hptdf4Ynh4w3 Yqh5LsNKFy5tjYJtoob5NWOylfYT0C8wAHXEJTIee4FMYD6XaC1Z/t1NHvAqGLvERMKn8/MBSIzJ6 JlF/3qkEiNeGW0ncX6we3hQ1RFzjXPROqnh4IFnK3FXEl7p5UbePZWEMmxhdIW/XteepLfOOFtRee +SwRA=; Received: from 92.40.248.179.threembb.co.uk ([92.40.248.179] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eMCcT-0001M2-D5; Tue, 05 Dec 2017 12:46:41 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 9299844006B; Tue, 5 Dec 2017 12:46:39 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <871sk9vmj2.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20171205124639.9299844006B@finisterre.ee.mobilebroadband> Date: Tue, 5 Dec 2017 12:46:39 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: don't use rtd->codec on Intel/haswell" 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: don't use rtd->codec on Intel/haswell 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 187c43df88196c0c4b231771a39e4a46f20a4f7a Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 5 Dec 2017 04:23:52 +0000 Subject: [PATCH] ASoC: don't use rtd->codec on Intel/haswell rtd->codec will be removed soon. rtd->codec = rtd->codec_dai->codec, thus, we can use rtd->codec_dai->component instead of it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/intel/boards/haswell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/boards/haswell.c b/sound/soc/intel/boards/haswell.c index 5e1ea0371c90..3c5160779204 100644 --- a/sound/soc/intel/boards/haswell.c +++ b/sound/soc/intel/boards/haswell.c @@ -76,7 +76,7 @@ static int haswell_rt5640_hw_params(struct snd_pcm_substream *substream, } /* set correct codec filter for DAI format and clock config */ - snd_soc_update_bits(rtd->codec, 0x83, 0xffff, 0x8000); + snd_soc_component_update_bits(codec_dai->component, 0x83, 0xffff, 0x8000); return ret; }