From patchwork Wed Aug 2 17:30:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 109270 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp6494418obm; Wed, 2 Aug 2017 10:31:11 -0700 (PDT) X-Received: by 10.28.16.17 with SMTP id 17mr4073714wmq.1.1501695071148; Wed, 02 Aug 2017 10:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501695071; cv=none; d=google.com; s=arc-20160816; b=yKfTpZ57k2nWZ7L6sxk66cseKNqPFEtnQGrH0AJ+hTOGnxVQp7B48cZHGYR5nkrr+6 Nzn3Z37Bo6m2wzapf7lIbsjlUbSVURBV0FzK1sNkM3Eck91zhdNs3lcouy8nNh2B3n8W PSSbleHzoZbSI8hUvV3gMadf/W7TYvYbO8jUdtPPa5oqsQuiw330DK0JF9X0upwccH4D YyLKB69qcjLvgxXdfZt+IQyZ1v4P4QjQtAUekqJp/pIudhHiHjCRV1tJMrjTBMgy43r1 3Wh59GIGX0UZ4nclM9ogqv4JsRUtvf6RHXSPba7x+0TWIPkKiNHyMZiayNw2tCgMI9QQ nRTQ== 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=ZncQ9zgFZMfeYWYWPZj+9KQUGJ6r2ms0OmoBGsuQ000=; b=UPliJEwBoNpsO7UyByWsexpMcoVhTlipsZlP1hu/O6Rowa3C5hKRDtm6xL+y278G8S 1wnQr+AChoKnAoIFyKxBqCXGzNb3SMQFeY4us+xULzRu76YTMjuwwUCEtYeidfaEZDk7 gSv6D0n0Z+P/2/c+wtza/DTqwLm5JUwJRCiEd/JJyYZ9xv8XId83gB2x4cnRxYE1235b fhsOkJXncNhFEnZPr6QuqMhlVU6F6tSqybHwDBOy17LD+/aPTOdViiNEPJxDDKh5HhBX G9CrGM2y8v/KE8vzcU2kminYhN8sxccRAeMB3X+IFOgoQ+3xvvuAgrpdzIvwQFW2kLJr ibeQ== 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 g8si3592719wmd.268.2017.08.02.10.31.10; Wed, 02 Aug 2017 10:31:11 -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 56E002673C9; Wed, 2 Aug 2017 19:30:35 +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 9D6922673C8; Wed, 2 Aug 2017 19:30:33 +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, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED 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 C28C226739A for ; Wed, 2 Aug 2017 19:30:22 +0200 (CEST) Received: from debutante.sirena.org.uk ([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 1dcxTM-00054e-HR; Wed, 02 Aug 2017 17:30:18 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dcxTK-0003nA-0s; Wed, 02 Aug 2017 18:30:14 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87k22mp8zh.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 02 Aug 2017 18:30:14 +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: No (on mezzanine.sirena.org.uk); Unknown failure Cc: Linux-Renesas , alsa-devel@alsa-project.org, Mark Brown , "Yokoyama \(Renesas\)" , Simon Subject: [alsa-devel] Applied "ASoC: rcar: unregister fixed rate on ADG" 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: rcar: unregister fixed rate on ADG 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 e3c6de48133ff1355f14a31a74a9027834c0fd65 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 2 Aug 2017 10:26:09 +0000 Subject: [PATCH] ASoC: rcar: unregister fixed rate on ADG ADG is registering fixed rate clock for audio_clkout, but it had not been unregister clock when removing. Salvator-X board is using ak4613 driver now, and it supports hw_constraints from commit 907cd8809eebc ("ASoC: ak4613: add hw_constraint rule for Sampling Rate"). And this calculation is using input clk. This ak4613 input clock is ADG clkout on Salvator-X. Because ADG had not been unregister clkout when unbinding, it receives fixed rate clk register error when re-binding. Thus, ak4613 can't get correct input clock, and hw_constraints will be failed after re-binding. This means Salvator-X board can't use sound after unbind/bind. This patch solves this issue. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/adg.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 197cb3ec075f..5b5389e5b92b 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -610,6 +610,13 @@ void rsnd_adg_remove(struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); struct device_node *np = dev->of_node; + struct rsnd_adg *adg = priv->adg; + struct clk *clk; + int i; + + for_each_rsnd_clkout(clk, adg, i) + if (adg->clkout[i]) + clk_unregister_fixed_rate(adg->clkout[i]); of_clk_del_provider(np);