From patchwork Mon Feb 24 16:22:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 3710421 Return-Path: X-Original-To: patchwork-dmaengine@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 3C03DBF13A for ; Mon, 24 Feb 2014 16:28:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E97120149 for ; Mon, 24 Feb 2014 16:28:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 648BE20136 for ; Mon, 24 Feb 2014 16:28:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753037AbaBXQZF (ORCPT ); Mon, 24 Feb 2014 11:25:05 -0500 Received: from top.free-electrons.com ([176.31.233.9]:54478 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752316AbaBXQZE (ORCPT ); Mon, 24 Feb 2014 11:25:04 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id 8030381F; Mon, 24 Feb 2014 17:25:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost (189.58.26.109.rev.sfr.net [109.26.58.189]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4614F80A; Mon, 24 Feb 2014 17:25:02 +0100 (CET) From: Maxime Ripard To: Emilio Lopez , Dan Williams , Vinod Koul Cc: Mike Turquette , linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, Maxime Ripard Subject: [PATCH 1/5] clk: sun6i: Protect CPU clock Date: Mon, 24 Feb 2014 17:22:43 +0100 Message-Id: <1393258967-4843-2-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393258967-4843-1-git-send-email-maxime.ripard@free-electrons.com> References: <1393258967-4843-1-git-send-email-maxime.ripard@free-electrons.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Right now, AHB is an indirect child clock of the CPU clock. If that happens to change, since the CPU clock has no other consumers declared in Linux, it would be shut down, which is not really a good idea. Prevent this by forcing it enabled. Signed-off-by: Maxime Ripard --- drivers/clk/sunxi/clk-sunxi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 23baad9..cedaf4b 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -1301,6 +1301,14 @@ static void __init sunxi_clock_protect(void) clk_prepare_enable(clk); clk_put(clk); } + + /* CPU clocks - sun6i */ + clk = clk_get(NULL, "cpu"); + if (!IS_ERR(clk)) { + clk_prepare_enable(clk); + clk_put(clk); + } + } static void __init sunxi_init_clocks(void)