From patchwork Sun Jan 27 10:40:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Baatz X-Patchwork-Id: 2051531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id C2EB8DFE86 for ; Sun, 27 Jan 2013 10:43:27 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TzPfa-0004fo-Ka; Sun, 27 Jan 2013 10:41:02 +0000 Received: from mail-we0-x234.google.com ([2a00:1450:400c:c03::234]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TzPfF-0004cU-S6 for linux-arm-kernel@lists.infradead.org; Sun, 27 Jan 2013 10:40:42 +0000 Received: by mail-we0-f180.google.com with SMTP id k14so898135wer.25 for ; Sun, 27 Jan 2013 02:40:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=x6LrNbDIksslBKjqPVuNeuPor/5EjqeMkZNKwR1dSkg=; b=GyNKjKvkRhzB4f1Ehv55QiHeY92LIclYW58a2+V/r/XFUXY8vNTUZzkZ6JvFPP4HeR A8wJnWNNJ9yHVDLLWXjWNi3ISwM12zNS/BJWjjONAcxjyNOo5udTFRXqaeFJVIPo4Ytv WSj2C6MiVEWbnkAd5UgoyWbcfJqxPxrwj89LB23bxWKjk0DqzkrpOmrg9QTJBNmj0Q16 Wh44psdSZCtvnzEqijGolJUXN6MtqL/UuOW36u6UfkNZkxlAqS9mUodDNg9U2kS7LuGb GIj6Wqh6+RTUOzV5AXTv4J92Afxf9XG6vkF4Q6u+CUZjdA/djE/m2xJSI9wR4cqqU5/c yjSA== X-Received: by 10.195.13.200 with SMTP id fa8mr16259851wjd.15.1359283239959; Sun, 27 Jan 2013 02:40:39 -0800 (PST) Received: from gandalf.schnuecks.de (p5DE8D22A.dip.t-dialin.net. [93.232.210.42]) by mx.google.com with ESMTPS id hg17sm6648369wib.1.2013.01.27.02.40.38 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 27 Jan 2013 02:40:39 -0800 (PST) Received: by gandalf.schnuecks.de (Postfix, from userid 500) id 7517540156; Sun, 27 Jan 2013 11:40:37 +0100 (CET) From: Simon Baatz To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/2] clk: mvebu: Do not gate runit clock on Kirkwood Date: Sun, 27 Jan 2013 11:40:23 +0100 Message-Id: <1359283223-23082-3-git-send-email-gmbnomis@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359283223-23082-1-git-send-email-gmbnomis@gmail.com> References: <1359283223-23082-1-git-send-email-gmbnomis@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130127_054042_075106_E329C12F X-CRM114-Status: GOOD ( 11.91 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (gmbnomis[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, mturquette@linaro.org, jason@lakedaemon.net, sebastian.hesselbarth@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit f479db "ARM: Kirkwood: Ensure runit clock always ticks." made sure that the runit clock always ticks on Kirkwood. When moving the clock gating to clk-gating-ctrl.c for Kirkwood DT devices, this change was disabled. Set the CLK_IGNORE_UNUSED flag for "runit" to ensure that it always ticks. Signed-off-by: Simon Baatz --- drivers/clk/mvebu/clk-gating-ctrl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c index 8fa5408..da5f807 100644 --- a/drivers/clk/mvebu/clk-gating-ctrl.c +++ b/drivers/clk/mvebu/clk-gating-ctrl.c @@ -97,8 +97,11 @@ static void __init mvebu_clk_gating_setup( * isn't taken by any driver, but should anyway be * kept enabled, so we mark it as IGNORE_UNUSED for * now. + * Do the same for the "runit" clock on Kirkwood; + * gating this clock causes an immediate lockup. */ - if (!strcmp(descr[n].name, "ddr")) + if (!strcmp(descr[n].name, "ddr") + || !strcmp(descr[n].name, "runit")) flags |= CLK_IGNORE_UNUSED; ctrl->gates[n] = clk_register_gate(NULL, descr[n].name, parent,