From patchwork Wed Oct 2 19:06:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 2978481 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 03243BFF0B for ; Wed, 2 Oct 2013 19:09:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D493320306 for ; Wed, 2 Oct 2013 19:09:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F27A2037D for ; Wed, 2 Oct 2013 19:09:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754697Ab3JBTHS (ORCPT ); Wed, 2 Oct 2013 15:07:18 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:40931 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754622Ab3JBTHK (ORCPT ); Wed, 2 Oct 2013 15:07:10 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 5505A13EFFA; Wed, 2 Oct 2013 19:07:09 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 4519513F28D; Wed, 2 Oct 2013 19:07:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from sboyd-linux.qualcomm.com (i-global252.qualcomm.com [199.106.103.252]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C2F9E13F02B; Wed, 2 Oct 2013 19:07:08 +0000 (UTC) From: Stephen Boyd To: Mike Turquette Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Saravana Kannan Subject: [PATCH v2 1/9] clk: Allow drivers to pass in a regmap Date: Wed, 2 Oct 2013 12:06:58 -0700 Message-Id: <1380740826-29457-2-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 1.8.4.474.g128a96c In-Reply-To: <1380740826-29457-1-git-send-email-sboyd@codeaurora.org> References: <1380740826-29457-1-git-send-email-sboyd@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support to the clock core so that drivers can pass in a regmap. If no regmap is specified try to query the device that's registering the clock for its regmap. This should allow drivers to use the core regmap helpers. Signed-off-by: Stephen Boyd --- drivers/clk/clk.c | 8 ++++++++ include/linux/clk-provider.h | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a004769..6107daa 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -20,6 +20,7 @@ #include #include #include +#include static DEFINE_SPINLOCK(enable_lock); static DEFINE_MUTEX(prepare_lock); @@ -1829,6 +1830,13 @@ static int _clk_register(struct device *dev, struct clk_hw *hw, struct clk *clk) clk->num_parents = hw->init->num_parents; hw->clk = clk; + if (hw->init->regmap) + hw->regmap = hw->init->regmap; + else if (dev && dev_get_regmap(dev, NULL)) + hw->regmap = dev_get_regmap(dev, NULL); + else if (dev->parent) + hw->regmap = dev_get_regmap(dev->parent, NULL); + /* allocate local copy in case parent_names is __initdata */ clk->parent_names = kzalloc((sizeof(char*) * clk->num_parents), GFP_KERNEL); diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 73bdb69..6ed62f1 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -142,6 +142,8 @@ struct clk_ops { void (*init)(struct clk_hw *hw); }; +struct regmap; + /** * struct clk_init_data - holds init data that's common to all clocks and is * shared between the clock provider and the common clock framework. @@ -151,6 +153,7 @@ struct clk_ops { * @parent_names: array of string names for all possible parents * @num_parents: number of possible parents * @flags: framework-level hints and quirks + * @regmap: regmap to use for regmap helpers and/or by providers */ struct clk_init_data { const char *name; @@ -158,6 +161,7 @@ struct clk_init_data { const char **parent_names; u8 num_parents; unsigned long flags; + struct regmap *regmap; }; /** @@ -171,10 +175,13 @@ struct clk_init_data { * * @init: pointer to struct clk_init_data that contains the init data shared * with the common clock framework. + * + * @regmap: regmap to use for regmap helpers and/or by providers */ struct clk_hw { struct clk *clk; const struct clk_init_data *init; + struct regmap *regmap; }; /*