From patchwork Thu Feb 20 00:13:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 3683761 Return-Path: X-Original-To: patchwork-linux-arm@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 05D30BF13A for ; Thu, 20 Feb 2014 00:40:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00722201BA for ; Thu, 20 Feb 2014 00:40:19 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 BFB6A2016C for ; Thu, 20 Feb 2014 00:40:17 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGHJr-0002LY-QT; Thu, 20 Feb 2014 00:16:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGHJ3-0005BJ-B9; Thu, 20 Feb 2014 00:16:01 +0000 Received: from mail-ig0-f181.google.com ([209.85.213.181]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGHGi-0004uq-EJ for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2014 00:13:50 +0000 Received: by mail-ig0-f181.google.com with SMTP id y6so1152003igj.2 for ; Wed, 19 Feb 2014 16:13:15 -0800 (PST) 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=wJviS6HliDCi/EpV5MF5bjUDMwLuBGQd0dm8NBku7+s=; b=BMxlljvxI/CG/2W+0aOGI8C4n0pP9KCQnCzcmbkjhMM7dGR8uEC/LX7MK9eshffZbm qlyKkMqcullHqYhUvcF3Ac5Jhh4C9OfaYajthKUr/EoIkLQh+4/w6aLcYfdy+lgLxgtB vZCL/nFBCz1JB7GENPVeQJPvctlH+1V8Wkg6QQBtCN6uNConnkJCRJZDFxjMOK4+RdHI Ld0pfdFDzDxlcYZpx9Vua8uyviLlazRXr3d9Dt63KKI1Ut6rEgG1bT1m1QEzvM135rwP h6qnucGDMT/9uNL2egZh1JshMcy7XwjriMS5JA3+srgYmi1BF0hiTLHXTol19oUMZZO6 B25A== X-Gm-Message-State: ALoCoQmoQy1JWT+vZOhPJaoK2iaHc2poJzAWhfKo2tf0Y44goBSOvAz27j296N+4jg6BXppRYvbQ X-Received: by 10.42.129.9 with SMTP id o9mr16966274ics.38.1392855195541; Wed, 19 Feb 2014 16:13:15 -0800 (PST) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id gd5sm5623419igd.5.2014.02.19.16.13.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 16:13:15 -0800 (PST) From: Alex Elder To: mturquette@linaro.org, bcm@fixthebug.org, mporter@linaro.org, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk Subject: [PATCH 11/12] clk: bcm281xx: add bus clock support Date: Wed, 19 Feb 2014 18:13:01 -0600 Message-Id: <1392855182-21155-12-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1392855182-21155-1-git-send-email-elder@linaro.org> References: <1392855182-21155-1-git-send-email-elder@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140219_191336_649705_C6EAB45B X-CRM114-Status: GOOD ( 18.43 ) X-Spam-Score: 0.3 (/) Cc: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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=-1.9 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, 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 Add bus clock support. A bus clock has a subset of the components present in a peripheral clock (again, all optional): a gate; CCU policy management bits; and if needed, bits to control hysteresis. Signed-off-by: Alex Elder --- drivers/clk/bcm/clk-kona-setup.c | 96 ++++++++++++++++++++++++++++++++++++-- drivers/clk/bcm/clk-kona.c | 58 +++++++++++++++++++++++ drivers/clk/bcm/clk-kona.h | 8 ++++ 3 files changed, 159 insertions(+), 3 deletions(-) diff --git a/drivers/clk/bcm/clk-kona-setup.c b/drivers/clk/bcm/clk-kona-setup.c index 973053b..f8c7954 100644 --- a/drivers/clk/bcm/clk-kona-setup.c +++ b/drivers/clk/bcm/clk-kona-setup.c @@ -76,6 +76,56 @@ static bool clk_requires_trigger(struct kona_clk *bcm_clk) return divider_exists(div) && !divider_is_fixed(div); } +static bool bus_clk_data_offsets_valid(struct kona_clk *bcm_clk) +{ + struct bus_clk_data *bus; + struct bcm_clk_policy *policy; + struct bcm_clk_gate *gate; + struct bcm_clk_hyst *hyst; + const char *name; + u32 limit; + + BUG_ON(bcm_clk->type != bcm_clk_bus); + bus = bcm_clk->bus; + name = bcm_clk->init_data.name; + + limit = bcm_clk->ccu->range - sizeof(u32); + limit = round_down(limit, sizeof(u32)); + + policy = &bus->policy; + if (policy_exists(policy)) { + if (policy->offset > limit) { + pr_err("%s: bad policy offset for %s (%u > %u)\n", + __func__, name, policy->offset, limit); + return false; + } + } + + gate = &bus->gate; + hyst = &bus->hyst; + if (gate_exists(gate)) { + if (gate->offset > limit) { + pr_err("%s: bad gate offset for %s (%u > %u)\n", + __func__, name, gate->offset, limit); + return false; + } + if (hyst_exists(hyst)) { + if (hyst->offset > limit) { + pr_err("%s: bad hysteresis offset for %s " + "(%u > %u)\n", __func__, + name, hyst->offset, limit); + return false; + } + } + } else if (hyst_exists(hyst)) { + pr_err("%s: hysteresis but no gate for %s\n", __func__, name); + return false; + } + + + return true; +} + static bool peri_clk_data_offsets_valid(struct kona_clk *bcm_clk) { struct peri_clk_data *peri; @@ -86,15 +136,13 @@ static bool peri_clk_data_offsets_valid(struct kona_clk *bcm_clk) struct bcm_clk_sel *sel; struct bcm_clk_trig *trig; const char *name; - u32 range; u32 limit; BUG_ON(bcm_clk->type != bcm_clk_peri); peri = bcm_clk->peri; name = bcm_clk->init_data.name; - range = bcm_clk->ccu->range; - limit = range - sizeof(u32); + limit = bcm_clk->ccu->range - sizeof(u32); limit = round_down(limit, sizeof(u32)); policy = &peri->policy; @@ -396,6 +444,23 @@ static bool trig_valid(struct bcm_clk_trig *trig, const char *field_name, return bit_posn_valid(trig->bit, field_name, clock_name); } +/* Determine whether the set of bus clock registers are valid. */ +static bool +bus_clk_data_valid(struct kona_clk *bcm_clk) +{ + struct bcm_clk_gate *gate; + + BUG_ON(bcm_clk->type != bcm_clk_bus); + if (!bus_clk_data_offsets_valid(bcm_clk)) + return false; + + gate = &bcm_clk->bus->gate; + if (!gate_exists(gate)) + return true; + + return gate_valid(gate, "gate", bcm_clk->init_data.name); +} + /* Determine whether the set of peripheral clock registers are valid. */ static bool peri_clk_data_valid(struct kona_clk *bcm_clk) @@ -493,6 +558,10 @@ peri_clk_data_valid(struct kona_clk *bcm_clk) static bool kona_clk_valid(struct kona_clk *bcm_clk) { switch (bcm_clk->type) { + case bcm_clk_bus: + if (!bus_clk_data_valid(bcm_clk)) + return false; + break; case bcm_clk_peri: if (!peri_clk_data_valid(bcm_clk)) return false; @@ -663,6 +732,20 @@ static void clk_sel_teardown(struct bcm_clk_sel *sel, init_data->parent_names = NULL; } +static void bus_clk_teardown(struct bus_clk_data *data, + struct clk_init_data *init_data) +{ + /* Nothing to do */ +} + +static int +bus_clk_setup(struct bus_clk_data *data, struct clk_init_data *init_data) +{ + init_data->flags = CLK_IGNORE_UNUSED; + + return 0; +} + static void peri_clk_teardown(struct peri_clk_data *data, struct clk_init_data *init_data) { @@ -689,6 +772,9 @@ static void bcm_clk_teardown(struct kona_clk *bcm_clk) /* clkdev_remove(&bcm_clk->cl); */ switch (bcm_clk->type) { + case bcm_clk_bus: + bus_clk_teardown(bcm_clk->data, &bcm_clk->init_data); + break; case bcm_clk_peri: peri_clk_teardown(bcm_clk->data, &bcm_clk->init_data); break; @@ -725,6 +811,10 @@ struct clk *kona_clk_setup(struct kona_clk *bcm_clk) struct clk *clk = NULL; switch (bcm_clk->type) { + case bcm_clk_bus: + if (bus_clk_setup(bcm_clk->data, init_data)) + return NULL; + break; case bcm_clk_peri: if (peri_clk_setup(bcm_clk->data, init_data)) return NULL; diff --git a/drivers/clk/bcm/clk-kona.c b/drivers/clk/bcm/clk-kona.c index 37f7861..00db272 100644 --- a/drivers/clk/bcm/clk-kona.c +++ b/drivers/clk/bcm/clk-kona.c @@ -984,6 +984,36 @@ static int selector_write(struct ccu_data *ccu, struct bcm_clk_gate *gate, /* Clock operations */ +static int kona_bus_clk_enable(struct clk_hw *hw) +{ + struct kona_clk *bcm_clk = to_kona_clk(hw); + struct bcm_clk_gate *gate = &bcm_clk->bus->gate; + + return clk_gate(bcm_clk->ccu, bcm_clk->init_data.name, gate, true); +} + +static void kona_bus_clk_disable(struct clk_hw *hw) +{ + struct kona_clk *bcm_clk = to_kona_clk(hw); + struct bcm_clk_gate *gate = &bcm_clk->bus->gate; + + (void)clk_gate(bcm_clk->ccu, bcm_clk->init_data.name, gate, false); +} + +static int kona_bus_clk_is_enabled(struct clk_hw *hw) +{ + struct kona_clk *bcm_clk = to_kona_clk(hw); + struct bcm_clk_gate *gate = &bcm_clk->bus->gate; + + return is_clk_gate_enabled(bcm_clk->ccu, gate) ? 1 : 0; +} + +struct clk_ops kona_bus_clk_ops = { + .enable = kona_bus_clk_enable, + .disable = kona_bus_clk_disable, + .is_enabled = kona_bus_clk_is_enabled, +}; + static int kona_peri_clk_enable(struct clk_hw *hw) { struct kona_clk *bcm_clk = to_kona_clk(hw); @@ -1142,6 +1172,31 @@ struct clk_ops kona_peri_clk_ops = { .set_rate = kona_peri_clk_set_rate, }; +/* Put a bus clock into its initial state */ +static bool __bus_clk_init(struct kona_clk *bcm_clk) +{ + struct ccu_data *ccu = bcm_clk->ccu; + struct bus_clk_data *bus = bcm_clk->bus; + const char *name = bcm_clk->init_data.name; + + BUG_ON(bcm_clk->type != bcm_clk_bus); + + if (!policy_init(ccu, &bus->policy)) { + pr_err("%s: error initializing policy for %s\n", + __func__, name); + return false; + } + if (!gate_init(ccu, &bus->gate)) { + pr_err("%s: error initializing gate for %s\n", __func__, name); + return false; + } + if (!hyst_init(ccu, &bus->hyst)) { + pr_err("%s: error initializing hyst for %s\n", __func__, name); + return false; + } + return true; +} + /* Put a peripheral clock into its initial state */ static bool __peri_clk_init(struct kona_clk *bcm_clk) { @@ -1246,6 +1301,9 @@ static bool __kona_clk_init(struct kona_clk *bcm_clk) return false; switch (bcm_clk->type) { + case bcm_clk_bus: + ret = __bus_clk_init(bcm_clk); + break; case bcm_clk_peri: ret = __peri_clk_init(bcm_clk); break; diff --git a/drivers/clk/bcm/clk-kona.h b/drivers/clk/bcm/clk-kona.h index 27e0913..fdb25c6 100644 --- a/drivers/clk/bcm/clk-kona.h +++ b/drivers/clk/bcm/clk-kona.h @@ -389,6 +389,12 @@ struct bcm_clk_trig { .flags = FLAG(TRIG, EXISTS), \ } +struct bus_clk_data { + struct bcm_clk_policy policy; + struct bcm_clk_gate gate; + struct bcm_clk_hyst hyst; +}; + struct peri_clk_data { struct bcm_clk_policy policy; struct bcm_clk_gate gate; @@ -416,6 +422,7 @@ struct kona_clk { }; union { void *data; + struct bus_clk_data *bus; struct peri_clk_data *peri; }; }; @@ -520,6 +527,7 @@ struct ccu_data { /* Exported globals */ +extern struct clk_ops kona_bus_clk_ops; extern struct clk_ops kona_peri_clk_ops; /* Externally visible functions */