From patchwork Fri May 30 20:53:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 4274031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1F80A9F336 for ; Fri, 30 May 2014 20:55:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37B1E203B1 for ; Fri, 30 May 2014 20:55:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0AD7D202E5 for ; Fri, 30 May 2014 20:55:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WqToF-00038c-0Q; Fri, 30 May 2014 20:53:51 +0000 Received: from mail-ie0-f172.google.com ([209.85.223.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WqTny-0002yB-6U for linux-arm-kernel@lists.infradead.org; Fri, 30 May 2014 20:53:34 +0000 Received: by mail-ie0-f172.google.com with SMTP id tp5so2284179ieb.17 for ; Fri, 30 May 2014 13:53:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1Kvt0rtFA153+dIcOLpXw/mc0fvP0aw/oLrspCJ2tiE=; b=R5nIJ49H1kbPJz9t5G76s5wKvEJWsTa9z2yybYS2gw91zfEjyX1grUHxZ7jkXFF8FL gaOuT7cc/2A3s065tK7e6LAB8JL2vkUdOnfJGLak6+W6LonDTsbf0pqkIHJON5UU954b MPwU4cAqJ5kp0TgZXQtZQG/bY4CIhiwDqDdaAYctiRWCs1Lp1EIczSZOxyHigKYPVn3M ZjgPFELrq0oMMFqBUv+8M3LPplSoNpQM9pYYNWfZKXrzGMlK0rKizZo7aIaTIif3+Yh/ 6hWYiKG/dlMkG1z+Nzqs2Sz6RRkENmXDchcgQeTYakPC5weIuacXUlGosnR8WlUYW6lM EElg== X-Gm-Message-State: ALoCoQkxNUfOl7E7oElXt0EAbE/rBPnh2mZlXXcPTWxWu9jjFxrejwXU7fDcbo3SsmSiJoDD5S1i X-Received: by 10.42.20.205 with SMTP id h13mr6529446icb.84.1401483194107; Fri, 30 May 2014 13:53:14 -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 b8sm8057705igx.3.2014.05.30.13.53.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 May 2014 13:53:13 -0700 (PDT) From: Alex Elder To: mturquette@linaro.org, mporter@linaro.org, bcm@fixthebug.org Subject: [PATCH v4 3/7] clk: kona: don't init clocks at startup time Date: Fri, 30 May 2014 15:53:04 -0500 Message-Id: <1401483188-5395-4-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401483188-5395-1-git-send-email-elder@linaro.org> References: <1401483188-5395-1-git-send-email-elder@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140530_135334_278222_CF7A3209 X-CRM114-Status: GOOD ( 18.20 ) X-Spam-Score: -0.7 (/) Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 48 ++++++++++++++++++---------------------- drivers/clk/bcm/clk-kona.h | 1 - 3 files changed, 22 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 0c64504..9a69a01 100644 --- a/drivers/clk/bcm/clk-kona.c +++ b/drivers/clk/bcm/clk-kona.c @@ -1026,43 +1026,37 @@ 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 = bcm_clk->ccu; + unsigned long flags; + int ret = 0; + + 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) { @@ -1264,6 +1258,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 e9a8466..3409111 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 */