From patchwork Thu Dec 19 11:23:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 3377141 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 23976C0D4B for ; Thu, 19 Dec 2013 11:27:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6025A2063F for ; Thu, 19 Dec 2013 11:27: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 D7DB220627 for ; Thu, 19 Dec 2013 11:27: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 1Vtbk4-0007bx-79; Thu, 19 Dec 2013 11:26:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vtbji-0004Ey-C1; Thu, 19 Dec 2013 11:25:50 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vtbj0-00044r-Cy for linux-arm-kernel@lists.infradead.org; Thu, 19 Dec 2013 11:25:09 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id rBJBOivH009918; Thu, 19 Dec 2013 05:24:44 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBJBOhhN014837; Thu, 19 Dec 2013 05:24:44 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Thu, 19 Dec 2013 05:24:43 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBJBOUgv009888; Thu, 19 Dec 2013 05:24:41 -0600 From: Tero Kristo To: , , , , , , Subject: [PATCHv11 03/49] clk: divider: add support for registering divider clock from descriptor Date: Thu, 19 Dec 2013 13:23:34 +0200 Message-ID: <1387452260-23276-4-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387452260-23276-1-git-send-email-t-kristo@ti.com> References: <1387452260-23276-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131219_062506_788191_2BBE9192 X-CRM114-Status: GOOD ( 11.63 ) X-Spam-Score: -7.4 (-------) Cc: devicetree@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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, 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 New clk_register_desc() call can be used to register this clock type now. Signed-off-by: Tero Kristo --- drivers/clk/clk-divider.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/clk-provider.h | 23 +++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 8d3009e..8cfed5c 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -28,8 +28,12 @@ * parent - fixed parent. No clk_set_parent support */ +/* resolve struct clk_divider from inner struct clk_hw member */ #define to_clk_divider(_hw) container_of(_hw, struct clk_divider, hw) +/* resolve struct clk_divider_desc from inner struct clk_desc member */ +#define to_hw_desc(_desc) container_of(_desc, struct clk_divider_desc, desc) + #define div_mask(d) ((1 << ((d)->width)) - 1) static unsigned int _get_table_maxdiv(const struct clk_div_table *table) @@ -343,3 +347,33 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name, width, clk_divider_flags, table, lock); } EXPORT_SYMBOL_GPL(clk_register_divider_table); + +struct clk_hw *clk_register_divider_desc(struct device *dev, + struct clk_desc *desc) +{ + struct clk_divider *divider; + struct clk_divider_desc *hw_desc; + + hw_desc = to_hw_desc(desc); + + /* allocate divider clock */ + divider = kzalloc(sizeof(*divider), GFP_KERNEL); + if (!divider) + return ERR_PTR(-ENOMEM); + + /* populate struct clk_divider assignments */ + divider->reg = hw_desc->reg; + divider->shift = hw_desc->shift; + divider->width = hw_desc->width; + divider->flags = hw_desc->flags; + divider->table = hw_desc->table; + divider->lock = hw_desc->lock; + + if (!desc->ops) + desc->ops = &clk_divider_ops; + + desc->flags |= CLK_IS_BASIC; + + return ÷r->hw; +} +EXPORT_SYMBOL_GPL(clk_register_divider_desc); diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 82dfe84..9fa279d 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -323,11 +323,34 @@ struct clk_divider { spinlock_t *lock; }; +/** + * struct clk_divider_desc - init descriptor for divider clock + * + * @desc: handle between common and hardware-specific interfaces + * @reg: register containing the divider + * @shift: shift to the divider bit field + * @width: width of the divider bit field + * @table: array of value/divider pairs, last entry should have div = 0 + * @lock: register lock + */ +struct clk_divider_desc { + struct clk_desc desc; + void __iomem *reg; + u8 shift; + u8 width; + u8 flags; + const struct clk_div_table *table; + spinlock_t *lock; +}; + #define CLK_DIVIDER_ONE_BASED BIT(0) #define CLK_DIVIDER_POWER_OF_TWO BIT(1) #define CLK_DIVIDER_ALLOW_ZERO BIT(2) #define CLK_DIVIDER_HIWORD_MASK BIT(3) +struct clk_hw *clk_register_divider_desc(struct device *dev, + struct clk_desc *desc); + extern const struct clk_ops clk_divider_ops; struct clk *clk_register_divider(struct device *dev, const char *name, const char *parent_name, unsigned long flags,