From patchwork Wed Dec 27 10:39:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 122769 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp7547159edb; Wed, 27 Dec 2017 02:39:50 -0800 (PST) X-Google-Smtp-Source: ACJfBotQtTO56riSX022NPijSBF+4gZtYvAgwAoeXmtcjMi+DEdCySilMlIprRkG7KiILPiPskiq X-Received: by 10.223.133.66 with SMTP id 60mr25671126wrh.49.1514371190389; Wed, 27 Dec 2017 02:39:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514371190; cv=none; d=google.com; s=arc-20160816; b=a9UrmcO0+vwqY8PvosX7pfktOtJidKaUoJO1WcPUyhjektxA1B1BPg+tgZNOjuidwR Px63DYOOaPy4QF1CnL4Dq+hC7UNDyD+yNXW2odwB7P0Q68372sIB+YbXMYLfPpXMviG7 EzTovI3jPMNK4Q9EkEtQFrobu/gsVHmclYKlgghLibC9cyBlizDScXGpfp6qVNwKYnXJ 6Sg+gx/vFljhbK426wfStBuHkPXi/s0am+9GtLmse1hDlJ7x6bNLp0J0VbyqHg1VY66b x5KY9O3lzJystkBVY5u5ZWsA80r2+HwbMACNDmgttFCMXqmh1MHuzTIzh5n1U4N+oOCd sPGg== 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=WD73LW3QLJnDyQE+FR+Fm0EWTsSxBGlj47C0rDSgUr8=; b=wQAvn3fFzvCcatL3Tm1tHbaNxAT0vfNm2a35Zhz52mUk97MJwfGAa8s6AT8sPGDEkB K4Smz+5eGhZ6G5xu104sJ5kEJYckyOyqCYVWVl/0+uxmrpWNEVmdRqtv+4OcShAwxCqN QpoufyZfD/ZSOlgLKdZ41R6DPBXLniMrJITmwSSlVWOTGtAu0hjaaR6qChqMNVvG2lHA 1cvGWfEx0knApE1Ng7oX1sRcQ+kj2BHahHCC1WM1N9EcbVIHhhmTctGXKno8thq7lfPW U4WREp/Q5kNOYJ9j1Vv175Kz6VVVllbGwdBgrvI9EREdllrx5sEoaHUMFlBcoFI3yxn0 Absg== 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=Fp4yewHb; 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 11si11833035wra.131.2017.12.27.02.39.50; Wed, 27 Dec 2017 02:39:50 -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=Fp4yewHb; 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 6508326739E; Wed, 27 Dec 2017 11:39:41 +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 BDAC326739E; Wed, 27 Dec 2017 11:39:39 +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 3405C267396 for ; Wed, 27 Dec 2017 11:39:38 +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=5ao7gvxXmk3OiOpEm5gisIAVwuo+IJUo0EhnZuwIVtE=; b=Fp4yewHbKd9g nQ2md7+n5qeG5NPC47JRnzFrPbfPQU7sxkXNjj80Zxm1KE3fEw3qGNJ7+qHAdw3f6/8Pre/44gn5i zziQlwOMj0HPTIX7DSReRMziyTed/V8i1Y/Sirm7elPE4gTkffHvm/usISgvLkXUY1xd9eQ3WQ850 sTrvQ=; Received: from host159-180-118-107.range159-180.btcentralplus.com ([159.180.118.107] 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 1eU97Z-00049h-Ro; Wed, 27 Dec 2017 10:39:37 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 531E944006B; Wed, 27 Dec 2017 10:39:37 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87zi6exk5i.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20171227103937.531E944006B@finisterre.ee.mobilebroadband> Date: Wed, 27 Dec 2017 10:39:37 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: wm2200: don't use snd_soc_dai::symmetric_rates" 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: wm2200: don't use snd_soc_dai::symmetric_rates 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 0e2d95aadd5c3bddfa4145b964527df12d89ec6a Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 20 Dec 2017 01:37:54 +0000 Subject: [PATCH] ASoC: wm2200: don't use snd_soc_dai::symmetric_rates wm2200 is the only user of snd_soc_dai::symmetric_rates. Now, wm2200 is using single DAI on Component. Thus, wm2200_priv : snd_soc_dai : snd_soc_component are 1 : 1 : 1. We can replace snd_soc_dai::symmetric_rates on wm2200_priv. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/wm2200.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 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/wm2200.c b/sound/soc/codecs/wm2200.c index 2d03db6efb79..5c2f5727244d 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -98,6 +98,8 @@ struct wm2200_priv { int rev; int sysclk; + + unsigned int symmetric_rates:1; }; #define WM2200_DSP_RANGE_BASE (WM2200_MAX_REGISTER + 1) @@ -1758,7 +1760,7 @@ static int wm2200_hw_params(struct snd_pcm_substream *substream, lrclk = bclk_rates[bclk] / params_rate(params); dev_dbg(codec->dev, "Setting %dHz LRCLK\n", bclk_rates[bclk] / lrclk); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK || - dai->symmetric_rates) + wm2200->symmetric_rates) snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_7, WM2200_AIF1RX_BCPF_MASK, lrclk); else @@ -2059,13 +2061,14 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source, static int wm2200_dai_probe(struct snd_soc_dai *dai) { struct snd_soc_codec *codec = dai->codec; + struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec); unsigned int val = 0; int ret; ret = snd_soc_read(codec, WM2200_GPIO_CTRL_1); if (ret >= 0) { if ((ret & WM2200_GP1_FN_MASK) != 0) { - dai->symmetric_rates = true; + wm2200->symmetric_rates = true; val = WM2200_AIF1TX_LRCLK_SRC; } } else {