From patchwork Fri Mar 28 12:27:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 3902921 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E11FABF540 for ; Fri, 28 Mar 2014 12:27:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A40B202B8 for ; Fri, 28 Mar 2014 12:27:32 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 05E7A20166 for ; Fri, 28 Mar 2014 12:27:31 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 626712654DD; Fri, 28 Mar 2014 13:27:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E99312654B5; Fri, 28 Mar 2014 13:27:18 +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 018E82654B8; Fri, 28 Mar 2014 13:27:17 +0100 (CET) Received: from ducie-dc1.codethink.co.uk (unknown [185.25.241.215]) by alsa0.perex.cz (Postfix) with ESMTP id 3E6002654B5 for ; Fri, 28 Mar 2014 13:27:11 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 8032C46596C; Fri, 28 Mar 2014 12:27:10 +0000 (GMT) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lj4aN1i93sHe; Fri, 28 Mar 2014 12:27:09 +0000 (GMT) Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [10.24.1.133]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id CAE384653D4; Fri, 28 Mar 2014 12:27:08 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1WTVsK-0006Qw-HW; Fri, 28 Mar 2014 12:27:08 +0000 From: Ben Dooks To: alsa-devel@alsa-project.org Date: Fri, 28 Mar 2014 12:27:06 +0000 Message-Id: <1396009626-24699-1-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.9.0 Cc: linux-kernel@lists.codethink.co.uk, kuninori.morimoto.gx@renesas.com, linux-sh@vger.kernel.org, lgirdwood@gmail.com, broonie@kernel.org, magnus.damm@opensource.se, William Towle Subject: [alsa-devel] [PATCH] ASoC: rsnd: SSI needs to prepare clocks before enabling 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 X-Virus-Scanned: ClamAV using ClamSMTP From: William Towle The rsnd_ssi_hw_{stop|start} functions need to call clk_prepare_enable() and clk_disable_unprepare(), otherwise the following warning occurs on attempt to play sound: WARNING: CPU: 2 PID: 1176 at drivers/clk/clk.c:926 __clk_enable+0x30/0x9c() due to drivers/clk/clk.c: 926 if (WARN_ON(clk->prepare_count == 0)) 927 return -ESHUTDOWN; Signed-off-by: William Towle [ben.dooks@codethink.co.uk: add more bug info to report] Tested-by: Ben Dooks --- sound/soc/sh/rcar/ssi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 4b8cf7c..1c07ef7 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -250,7 +250,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi, u32 cr; if (0 == ssi->usrcnt) { - clk_enable(ssi->clk); + clk_prepare_enable(ssi->clk); if (rsnd_rdai_is_clk_master(rdai)) { if (rsnd_ssi_clk_from_parent(ssi)) @@ -309,7 +309,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi, rsnd_ssi_master_clk_stop(ssi); } - clk_disable(ssi->clk); + clk_disable_unprepare(ssi->clk); } dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));