From patchwork Mon Jun 16 13:40:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 31962 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8D925206A0 for ; Mon, 16 Jun 2014 13:40:01 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kq14sf5565360pab.4 for ; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=aR/oElONKbq9BXSAoF9wNuy4HrXusa6b1Wlf/6regTc=; b=G0+/o2AmzwVNoJ0hBAFb3iUKcWSFqWjbQicSycgy05cQrl4FUCT5tUWIYv1wTLzupU ZocCSBYVHBQit9JqaFRd8Y3kQqclCb5o2qSWNBSZhAQQK9O8cAOzbuRkrHk2IVgXXPAf gQO7v8SYdxlep02lFCFvrOrCYTV48ysg+kVw5D4wP0HLOzJtTzN8VGHPgCuCOu08dDQ6 9nZoXGsDqBPIpf/saRNHU5b7N89WnPsp135y8lrdNHx15C4lBz0bqqdH186f2pxvnPD0 4nONk/yNel9pNE7R8dD4puta59WPsiu24edGOl8OQro8FcX2XaognOaWy8PHLVAr0ucZ dP3g== X-Gm-Message-State: ALoCoQl7yQC5AcqhGlhswYHUldQYN5M+ProNvQAXWasi+YXiCKbPi2ANB0IZBpA67EpC77WuxuWl X-Received: by 10.66.216.130 with SMTP id oq2mr71663pac.44.1402926000874; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.165 with SMTP id 34ls2304211qgl.1.gmail; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) X-Received: by 10.58.29.234 with SMTP id n10mr16311523veh.16.1402926000747; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id jv10si4109310veb.79.2014.06.16.06.40.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Jun 2014 06:40:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id jz11so5994922veb.2 for ; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) X-Received: by 10.58.198.46 with SMTP id iz14mr169504vec.53.1402926000665; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp135836vcb; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) X-Received: by 10.66.142.135 with SMTP id rw7mr24662265pab.71.1402925999366; Mon, 16 Jun 2014 06:39:59 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lf13si13700783pab.199.2014.06.16.06.39.58; Mon, 16 Jun 2014 06:39:58 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753657AbaFPNjx (ORCPT + 7 others); Mon, 16 Jun 2014 09:39:53 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:40400 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753579AbaFPNjv (ORCPT ); Mon, 16 Jun 2014 09:39:51 -0400 Received: by mail-ig0-f178.google.com with SMTP id hn18so2931337igb.17 for ; Mon, 16 Jun 2014 06:39:51 -0700 (PDT) X-Received: by 10.42.121.212 with SMTP id k20mr21346949icr.21.1402925991476; Mon, 16 Jun 2014 06:39:51 -0700 (PDT) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id k20sm20775727igf.5.2014.06.16.06.39.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jun 2014 06:39:51 -0700 (PDT) From: Alex Elder To: mturquette@linaro.org, mporter@linaro.org, bcm@fixthebug.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/7] clk: kona: don't init clocks at startup time Date: Mon, 16 Jun 2014 08:40:02 -0500 Message-Id: <1402926007-4436-3-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402926007-4436-1-git-send-email-elder@linaro.org> References: <1402926007-4436-1-git-send-email-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The last thing done for CCU setup is a call to kona_ccu_init(). This locks and enables write access on the CCU, then calls __kona_clk_init() for all of the clocks it provides. The purpose of this was to get or set the initial state of all the registers related to each clock. There's no reason to do this though. The common clock framework assumes nothing about the state of the hardware, and if a driver requires its clock to be in a particular state it can set that state up itself. Instead of initializing clocks at startup time, define a prepare method that performs that step when a clock is first needed. Signed-off-by: Alex Elder --- drivers/clk/bcm/clk-kona-setup.c | 3 --- drivers/clk/bcm/clk-kona.c | 49 +++++++++++++++++++--------------------- drivers/clk/bcm/clk-kona.h | 1 - 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/drivers/clk/bcm/clk-kona-setup.c b/drivers/clk/bcm/clk-kona-setup.c index e5aeded..317f7dd 100644 --- a/drivers/clk/bcm/clk-kona-setup.c +++ b/drivers/clk/bcm/clk-kona-setup.c @@ -867,9 +867,6 @@ void __init kona_dt_ccu_setup(struct ccu_data *ccu, goto out_err; } - if (!kona_ccu_init(ccu)) - pr_err("Broadcom %s initialization had errors\n", node->name); - return; out_err: kona_ccu_teardown(ccu); diff --git a/drivers/clk/bcm/clk-kona.c b/drivers/clk/bcm/clk-kona.c index b643d35..cacbfd6 100644 --- a/drivers/clk/bcm/clk-kona.c +++ b/drivers/clk/bcm/clk-kona.c @@ -1032,43 +1032,38 @@ static bool __peri_clk_init(struct kona_clk *bcm_clk) return true; } -static bool __kona_clk_init(struct kona_clk *bcm_clk) +/* Clock operations */ + +static int kona_clk_prepare(struct clk_hw *hw) { + struct kona_clk *bcm_clk = to_kona_clk(hw); + struct ccu_data *ccu; + unsigned long flags; + int ret = 0; + + ccu = bcm_clk->ccu; + flags = ccu_lock(ccu); + __ccu_write_enable(ccu); + switch (bcm_clk->type) { case bcm_clk_peri: - return __peri_clk_init(bcm_clk); + if (!__peri_clk_init(bcm_clk)) + ret = -EINVAL; + break; default: BUG(); } - return -EINVAL; -} - -/* Set a CCU and all its clocks into their desired initial state */ -bool __init kona_ccu_init(struct ccu_data *ccu) -{ - unsigned long flags; - unsigned int which; - struct clk **clks = ccu->clk_data.clks; - bool success = true; - - flags = ccu_lock(ccu); - __ccu_write_enable(ccu); - - for (which = 0; which < ccu->clk_data.clk_num; which++) { - struct kona_clk *bcm_clk; - - if (!clks[which]) - continue; - bcm_clk = to_kona_clk(__clk_get_hw(clks[which])); - success &= __kona_clk_init(bcm_clk); - } __ccu_write_disable(ccu); ccu_unlock(ccu, flags); - return success; + + return ret; } -/* Clock operations */ +static void kona_clk_unprepare(struct clk_hw *hw) +{ + /* Nothing to do. */ +} static int kona_peri_clk_enable(struct clk_hw *hw) { @@ -1270,6 +1265,8 @@ static int kona_peri_clk_set_rate(struct clk_hw *hw, unsigned long rate, } struct clk_ops kona_peri_clk_ops = { + .prepare = kona_clk_prepare, + .unprepare = kona_clk_unprepare, .enable = kona_peri_clk_enable, .disable = kona_peri_clk_disable, .is_enabled = kona_peri_clk_is_enabled, diff --git a/drivers/clk/bcm/clk-kona.h b/drivers/clk/bcm/clk-kona.h index 2537b30..4c7e796 100644 --- a/drivers/clk/bcm/clk-kona.h +++ b/drivers/clk/bcm/clk-kona.h @@ -511,6 +511,5 @@ extern u64 scaled_div_build(struct bcm_clk_div *div, u32 div_value, extern struct clk *kona_clk_setup(struct kona_clk *bcm_clk); extern void __init kona_dt_ccu_setup(struct ccu_data *ccu, struct device_node *node); -extern bool __init kona_ccu_init(struct ccu_data *ccu); #endif /* _CLK_KONA_H */