From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753595Ab1KIBXh (ORCPT ); Tue, 8 Nov 2011 20:23:37 -0500 Received: from mail-gx0-f174.google.com ([209.85.161.174]:50952 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658Ab1KIBXf (ORCPT ); Tue, 8 Nov 2011 20:23:35 -0500 From: Grant Likely To: devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Sascha Hauer , Rob Herring Cc: linux-kernel@vger.kernel.org, Jeremy Kerr , Grant Likely Subject: [RFC 7/8] arm/clkdev: lookup clocks from OF clock providers Date: Tue, 8 Nov 2011 18:19:42 -0700 Message-Id: <1320801583-12774-8-git-send-email-grant.likely@secretlab.ca> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320801583-12774-1-git-send-email-grant.likely@secretlab.ca> References: <1320801583-12774-1-git-send-email-grant.likely@secretlab.ca> 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 6db161f..63f81c9 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); @@ -78,6 +80,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_by_name(dev->of_node, con_id); + if (clk && __clk_get(clk)) + return clk; return clk_get_sys(dev_id, con_id); } -- 1.7.5.4