From patchwork Fri Oct 19 12:34:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149275 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3249749lji; Fri, 19 Oct 2018 05:34:47 -0700 (PDT) X-Google-Smtp-Source: AJdET5fJBjcwjBxivjRmnwbfgURzFkaSaTtAh3CZ+q032Zo+/4Hpro3994Bod5AxlL6LEtTnlL8f X-Received: by 2002:adf:d14a:: with SMTP id b10-v6mr7263251wri.17.1539952487159; Fri, 19 Oct 2018 05:34:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539952487; cv=none; d=google.com; s=arc-20160816; b=iMQNArccPq0gInzVIV01enHEh6seN5CjoYEzDwMm/DuXc75KRtH8s/QgjF1mq1l9YR nN+qKGkD33yVuLAWQd3YE5HHpO6Lr4qU+Oo07riN06KNdqKnOUZBluKFBR1hNNAcaWRa B90xTT3w0nN7T2vv5Yif0cNRzL6qhpYGFx+k0MSnR4u+X0qci04YxMNRvt54xyvo4fwj gVGT3N+SJ3+oGxfoFhj7NGK7IMGglqgz32npyCybahuJ+HShZxIgayMTXaTfxq477Jcj JPx2WyB/EUz14qnGTeHPYhtc5icyG/BNwIBnhiKiLy8h1HThg+lUntq5ydjoQeMJs6JX rI0A== 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; bh=H39My79QPcdKrGwfk7PlwWsA2wrP8kX8yyWix1vt8CU=; b=DrSXO3UrbGqkVEMZp1QKgiEAnZEuHOgRUwy4ZDjSWUVueEEx4PqqTicCXwOfuHykpw tmnBxSm+e8ej3l0xNTdOAz3W+x9WS6mBTL5tAcYw03+AqBFoQz6Sb8BjELkisG2IUlFe lY8Oqm7jdkYKc3UPypQO2ZndKEEMPsu1nF4DrOsQzABG5GD4XVQZFvMedjeKf5gZmlt+ TvJruYpYsqNn6P1txjFn7WVknnh38Y9MG3kZe+1ZX4Jq6Fu0Lml4NmVjw2CIeN9BZAYD +9LJ9lLIsw3q/VqaIFk/r5TjvmMlkYYV+fuvOZx70xmQYly6bX/jn8PhEvGF5IxiEcD7 rBgQ== 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="m8V98x/r"; 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 f26-v6si20460753wrc.26.2018.10.19.05.34.46; Fri, 19 Oct 2018 05:34:47 -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="m8V98x/r"; 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 90923267A80; Fri, 19 Oct 2018 14:34:28 +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 A914F267A80; Fri, 19 Oct 2018 14:34:25 +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 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 556F8267A71 for ; Fri, 19 Oct 2018 14:34:23 +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=3HYoEvzyN/9i6l6m/EvWUM1CUMgjjib0ZcDjKJlKmrw=; b=m8V98x/rdlmj Lw6wUFmg2qw6sweaaP/sb/CY8gNuGdVtu2b7B94IDvg6YV2+P9srQ/R1W82uqhy7dxWYk4fZXw1mw 6GxqId8LhBF5eUEMCRBoZx8P2h2tU5LlbC+9ka3LG2KG674XXySQFZ9cwrE+i8wqrZL/oiirVjsuL liDfw=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gDTyw-00007W-UT; Fri, 19 Oct 2018 12:34:22 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id A28891122548; Fri, 19 Oct 2018 13:34:22 +0100 (BST) From: Mark Brown To: Charles Keepax In-Reply-To: <20181011162831.26351-2-ckeepax@opensource.cirrus.com> Message-Id: <20181019123422.A28891122548@debutante.sirena.org.uk> Date: Fri, 19 Oct 2018 13:34:22 +0100 (BST) Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, broonie@kernel.org, lgirdwood@gmail.com Subject: [alsa-devel] Applied "ASoC: dapm: Add support for hw_free on CODEC to CODEC links" 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: dapm: Add support for hw_free on CODEC to CODEC links 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 3c01b0e129e9486c8004e43eba3a70de7393f645 Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Thu, 11 Oct 2018 17:28:28 +0100 Subject: [PATCH] ASoC: dapm: Add support for hw_free on CODEC to CODEC links Currently, on power down for a CODEC to CODEC DAI link we only call digital_mute and shutdown. Provide a little more flexibility for drivers by adding a call to hw_free as well. Signed-off-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/soc-dapm.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 8c5b065c8880..a5178845065b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3737,25 +3737,30 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, ret = 0; } + substream.stream = SNDRV_PCM_STREAM_CAPTURE; snd_soc_dapm_widget_for_each_source_path(w, path) { source = path->source->priv; + if (source->driver->ops->hw_free) + source->driver->ops->hw_free(&substream, + source); + source->active--; - if (source->driver->ops->shutdown) { - substream.stream = SNDRV_PCM_STREAM_CAPTURE; + if (source->driver->ops->shutdown) source->driver->ops->shutdown(&substream, source); - } } + substream.stream = SNDRV_PCM_STREAM_PLAYBACK; snd_soc_dapm_widget_for_each_sink_path(w, path) { sink = path->sink->priv; + if (sink->driver->ops->hw_free) + sink->driver->ops->hw_free(&substream, sink); + sink->active--; - if (sink->driver->ops->shutdown) { - substream.stream = SNDRV_PCM_STREAM_PLAYBACK; + if (sink->driver->ops->shutdown) sink->driver->ops->shutdown(&substream, sink); - } } break;