From mboxrd@z Thu Jan 1 00:00:00 1970 From: grant.likely@secretlab.ca (Grant Likely) Date: Tue, 25 Jan 2011 21:44:22 -0700 Subject: [RFC PATCH 4/5] arm/clkdev: lookup clocks from OF clock providers In-Reply-To: <20110126043338.16410.75019.stgit@localhost6.localdomain6> References: <20110126043338.16410.75019.stgit@localhost6.localdomain6> Message-ID: <20110126044422.16410.78703.stgit@localhost6.localdomain6> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Jeremy Kerr Hook the OF clock provider infrastructure to clk_get. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely --- drivers/clk/clkdev.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 0fc0a79..a546763 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -19,6 +19,8 @@ #include #include #include +#include +#include static LIST_HEAD(clocks); static DEFINE_MUTEX(clocks_mutex); @@ -79,6 +81,11 @@ EXPORT_SYMBOL(clk_get_sys); struct clk *clk_get(struct device *dev, const char *con_id) { const char *dev_id = dev ? dev_name(dev) : NULL; + struct clk *clk; + + clk = of_clk_get(dev, con_id); + if (clk && __clk_get(clk)) + return clk; return clk_get_sys(dev_id, con_id); } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999Ab1AZEo3 (ORCPT ); Tue, 25 Jan 2011 23:44:29 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:47061 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752962Ab1AZEo1 (ORCPT ); Tue, 25 Jan 2011 23:44:27 -0500 Subject: [RFC PATCH 4/5] arm/clkdev: lookup clocks from OF clock providers To: devicetree-discuss@lists.ozlabs.org, jeremy.kerr@canonical.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org From: Grant Likely Cc: nicolas.pitre@linaro.org Date: Tue, 25 Jan 2011 21:44:22 -0700 Message-ID: <20110126044422.16410.78703.stgit@localhost6.localdomain6> In-Reply-To: <20110126043338.16410.75019.stgit@localhost6.localdomain6> References: <20110126043338.16410.75019.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Kerr Hook the OF clock provider infrastructure to clk_get. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely --- drivers/clk/clkdev.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 0fc0a79..a546763 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -19,6 +19,8 @@ #include #include #include +#include +#include static LIST_HEAD(clocks); static DEFINE_MUTEX(clocks_mutex); @@ -79,6 +81,11 @@ EXPORT_SYMBOL(clk_get_sys); struct clk *clk_get(struct device *dev, const char *con_id) { const char *dev_id = dev ? dev_name(dev) : NULL; + struct clk *clk; + + clk = of_clk_get(dev, con_id); + if (clk && __clk_get(clk)) + return clk; return clk_get_sys(dev_id, con_id); } From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: [RFC PATCH 4/5] arm/clkdev: lookup clocks from OF clock providers Date: Tue, 25 Jan 2011 21:44:22 -0700 Message-ID: <20110126044422.16410.78703.stgit@localhost6.localdomain6> References: <20110126043338.16410.75019.stgit@localhost6.localdomain6> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20110126043338.16410.75019.stgit-bi+AKbBUZKagILUCTcTcHdKyNwTtLsGr@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: nicolas.pitre-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org List-Id: devicetree@vger.kernel.org From: Jeremy Kerr Hook the OF clock provider infrastructure to clk_get. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely --- drivers/clk/clkdev.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 0fc0a79..a546763 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -19,6 +19,8 @@ #include #include #include +#include +#include static LIST_HEAD(clocks); static DEFINE_MUTEX(clocks_mutex); @@ -79,6 +81,11 @@ EXPORT_SYMBOL(clk_get_sys); struct clk *clk_get(struct device *dev, const char *con_id) { const char *dev_id = dev ? dev_name(dev) : NULL; + struct clk *clk; + + clk = of_clk_get(dev, con_id); + if (clk && __clk_get(clk)) + return clk; return clk_get_sys(dev_id, con_id); }