From patchwork Fri Dec 20 16:34:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 3389811 Return-Path: X-Original-To: patchwork-linux-omap@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 639879F37A for ; Fri, 20 Dec 2013 16:35:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41D53206E6 for ; Fri, 20 Dec 2013 16:35:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EFCD206DE for ; Fri, 20 Dec 2013 16:35:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755556Ab3LTQfS (ORCPT ); Fri, 20 Dec 2013 11:35:18 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:42634 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755425Ab3LTQfP (ORCPT ); Fri, 20 Dec 2013 11:35:15 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id rBKGYr6i007289; Fri, 20 Dec 2013 10:34:53 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBKGYr9N008559; Fri, 20 Dec 2013 10:34:53 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Fri, 20 Dec 2013 10:34:52 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBKGYh6X031953; Fri, 20 Dec 2013 10:34:50 -0600 From: Tero Kristo To: , , , , , , CC: , Subject: [PATCHv12 03/49] clk: divider: add support for registering divider clock from descriptor Date: Fri, 20 Dec 2013 18:34:21 +0200 Message-ID: <1387557274-22583-3-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387557274-22583-1-git-send-email-t-kristo@ti.com> References: <1387557274-22583-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 | 22 ++++++++++++++++++++++ 2 files changed, 56 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 232623d..bf89ab4 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -322,11 +322,33 @@ 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,