From patchwork Tue Jun 13 21:07:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 105420 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp603793qgd; Tue, 13 Jun 2017 14:08:47 -0700 (PDT) X-Received: by 10.223.177.212 with SMTP id r20mr4789454wra.4.1497388126990; Tue, 13 Jun 2017 14:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497388126; cv=none; d=google.com; s=arc-20160816; b=bjKXSBYC007tHq+ybgORVNHwol8++L0vFiZqWXPMn6s/45A7QsAAPMv5/eHwQLBn2x jC6hDXuLKgHoQL1uH67i/njPmgFQYqZI3nhVsrvbX7vFne2642Sqd/NPii9iG7d+OJ/z MK+SYxpuZVu7mNVIaHubMlzK8vHdWXjYzrqGn1yVWcG3ZlbNnjdEcDObiRr+IjwcCgqI ddiYTbF8ApklGVzb7QnbSGCbc4oxDfxXxXhdI8fKDQLlZUpBgnqHcOJVQAehUfMxrwXv +VHDwngdq8zBsT1t8R0+X4C/phzF2LnR74GTPzXCMoQ2dL+uNAXqxXKb2PhE9StyVBpz O5AQ== 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=eDKseHxO57F1n8A2YpJe0ZZZGHWU6iKdKtOfpbI4ttE=; b=g5GX4FhcV+ZDqyBbrruX5yqiWd3E3wdUgKbNnAlvfOk42wdU79ap/aPqWVtPS30I4X C5WbHg4NBPPTGvjHqBFtBvZsUt6jcKmpLYo2l6DmJRTaqaRwjAimAPTfU/gCEE4U9kU8 NRT6mctFh2FTCSnj4z3fulrYp8eQRDVufQ6BjZITprH7lX14PAF0jZiwslAOQwMXJbJZ 7vEWetnfg5HWtc831QsG+ghniVjA5YNie+0sTeBGqcl2SDNAhHWrvkRXec9Skm1uYWWH Mnk/U0wkjXyUU5WjplOz1ugg8qjhK0OhEhqGK71Z5DRSKQxJf6c7bz/Eh8rJx4CBazuF 2x3Q== 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 s15si12271771wmb.0.2017.06.13.14.08.46; Tue, 13 Jun 2017 14:08:46 -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 9FAA8267024; Tue, 13 Jun 2017 23:07:57 +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 DC0A2266FFE; Tue, 13 Jun 2017 23:07:52 +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, RCVD_IN_DNSWL_NONE, SPF_PASS, T_RP_MATCHES_RCVD 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 B1D6E266F88 for ; Tue, 13 Jun 2017 23:07:48 +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.89) (envelope-from ) id 1dKt2P-0006yB-MX; Tue, 13 Jun 2017 21:07:46 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dKt2N-0000Ff-6i; Tue, 13 Jun 2017 22:07:43 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <8737bc4pco.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Tue, 13 Jun 2017 22:07:43 +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 Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Cc: linux-renesas-soc@vger.kernel.org, alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: simple-card: use asoc_simple_card_clk_xxx()" 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: simple-card: use asoc_simple_card_clk_xxx() 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 3ab50c4f98434080c1f73fc56d8d8b38364c6cd8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 9 Jun 2017 00:44:16 +0000 Subject: [PATCH] ASoC: simple-card: use asoc_simple_card_clk_xxx() Current simple-card-utils sets asoc_simple_dai::clk via asoc_simple_card_parse_clk(). Current simple card drivers are using it directly for clk_enable/disable. Encapsulation is one of simple card util's purpose. Let's use asoc_simple_card_clk_enable/disable. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/simple-card.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 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/generic/simple-card.c b/sound/soc/generic/simple-card.c index e26bd14ba70f..8828b91867b8 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -118,13 +118,13 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream) simple_priv_to_props(priv, rtd->num); int ret; - ret = clk_prepare_enable(dai_props->cpu_dai.clk); + ret = asoc_simple_card_clk_enable(&dai_props->cpu_dai); if (ret) return ret; - ret = clk_prepare_enable(dai_props->codec_dai.clk); + ret = asoc_simple_card_clk_enable(&dai_props->codec_dai); if (ret) - clk_disable_unprepare(dai_props->cpu_dai.clk); + asoc_simple_card_clk_disable(&dai_props->cpu_dai); return ret; } @@ -136,9 +136,9 @@ static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream) struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); - clk_disable_unprepare(dai_props->cpu_dai.clk); + asoc_simple_card_clk_disable(&dai_props->cpu_dai); - clk_disable_unprepare(dai_props->codec_dai.clk); + asoc_simple_card_clk_disable(&dai_props->codec_dai); } static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,