From patchwork Tue May 22 10:59:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 136531 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1460319lji; Tue, 22 May 2018 03:59:18 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp7EIBZaqc8JxYYw+1vSYUTRNeZbPVbZTF6FG05pfZAAQbbQT22Aq3s5+24TXIK7H1xYLEG X-Received: by 2002:a1c:6241:: with SMTP id w62-v6mr789268wmb.115.1526986758430; Tue, 22 May 2018 03:59:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526986758; cv=none; d=google.com; s=arc-20160816; b=Gw2kizKgzz/ecxVJWJgqN6bNa1fdhDVqKG6D/uEAThHf5fXTIBgfUNNH7uL2BhMDyL eLetY4HMk4v5VXb5+Nw26rwDNpVHXQA5o9vm34cWuoJlIiyFp+5+czyg69OXQ6f7YVC9 4/86PDwiLgVJnrCXv82kW3jV8wnXGWARa508vuhrnTQQStMgHFXixJgbqeGQ7qALEtQp 0P0nS9cLUHhh+5+ZVsChVlx7e2YhDzRHhFqDCGc99FYMtiLaEKzLTjmQcZhi5sp2Ntap +i/Vqjqjqo5b1k7/rERhAuY+ZeP7mUCW66nGKyTTJIzUa8dQd0bfrJ7whB5mHQFNZqgj 5mTA== 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=VqvpIhqHI6AD7/mCJ3Jw4AEjUgrUr/3+Ts8ajy/03cc=; b=socJLteOzgpZNMIsmFJxkO4gaRt+nrWFONeZJhG1kxry3HaZQ6yNd3rYP1ks3im3eM TULW1dbCGRSKG8xg8YxSG3ZrzY9iRBMFAVjB6mYA5b6G+JDgPweLT8IU8Qj6UQSpNMTv kZR/EUSfRMcRz6ZkM0X5pkS8JIK321L4vKTjnRFSte8AOIky7R6t5tanPXqUmUTfLNVd 6jMzfNSBmyA6AHCq0DUoyXbOSfwSL/N+Yb+26z/S1sT54VsxK4dxMRwRjXoiIPmG7gLT +Kii6HhUuhZIITdYz5lmE1Mk7J3XMFBGtQIMHY82KqRJqjkfWJIaq6JSJrFiQMlHBNvW Ej9w== 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=bUws/qVE; 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 f30-v6si798793wra.153.2018.05.22.03.59.18; Tue, 22 May 2018 03:59:18 -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; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=bUws/qVE; 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 1D630267662; Tue, 22 May 2018 12:59:17 +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 2E6E8267660; Tue, 22 May 2018 12:59:15 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS 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 C8FA6267680 for ; Tue, 22 May 2018 12:59:10 +0200 (CEST) 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=sTMcy5732MN9ZK0Qphc/krz/HTkcHlUldi0oXWGG3G0=; b=bUws/qVEVU19 p+Jh8RHvF9FwZ3FeDEg9z+V/P9ooIFsa3QsxvaV+So7H7dsEIH9cuFCT23gSKQZK5aYwYK9MRGm9G BNud+7cCECk2I/ug+9bCd4uj/TiZZsBeJRiv+gdJ3IM29jlLNqMa/C1yDdntKGODbeo4STrsbMEnB Z2/r8=; 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 1fL50W-0001xO-3F; Tue, 22 May 2018 10:59:08 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fL50V-0000Ta-Mb; Tue, 22 May 2018 11:59:07 +0100 From: Mark Brown To: Daniel Mack In-Reply-To: <20180521215017.29095-2-daniel@zonque.org> Message-Id: Date: Tue, 22 May 2018 11:59:07 +0100 Cc: alsa-devel@alsa-project.org, broonie@kernel.org, robert.jarzmik@free.fr, lars@metafoo.de, haojian.zhuang@gmail.com Subject: [alsa-devel] Applied "ASoC: pxa-ssp: simplify pxa_ssp_set_dai_sysclk()" 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: pxa-ssp: simplify pxa_ssp_set_dai_sysclk() 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 05f38281c5e5272ff1d350ed8762b08c4f6d10fc Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Mon, 21 May 2018 23:50:17 +0200 Subject: [PATCH] ASoC: pxa-ssp: simplify pxa_ssp_set_dai_sysclk() There's no need to read the register again prior to writing it, we did that in the beginning of the function. Signed-off-by: Daniel Mack Signed-off-by: Mark Brown --- sound/soc/pxa/pxa-ssp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index ffddcf117eb8..6fc986080130 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -217,10 +217,9 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, { struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai); struct ssp_device *ssp = priv->ssp; - int val; u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0) & - ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); + ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); dev_dbg(&ssp->pdev->dev, "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n", @@ -258,8 +257,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, * on PXA2xx. On PXA3xx it must be enabled when doing so. */ if (ssp->type != PXA3xx_SSP) clk_disable_unprepare(ssp->clk); - val = pxa_ssp_read_reg(ssp, SSCR0) | sscr0; - pxa_ssp_write_reg(ssp, SSCR0, val); + pxa_ssp_write_reg(ssp, SSCR0, sscr0); if (ssp->type != PXA3xx_SSP) clk_prepare_enable(ssp->clk);