From 19078561254fb4cb8febfbe2c4df960fe8f5b05e Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 6 Jul 2012 00:58:43 -0700
Subject: [PATCH] --- yaml --- r: 313399 b: refs/heads/master c:
 68c9a95e9253ce1776bd21bf8d37ddf213cced66 h: refs/heads/master i:   313397:
 0736f1c5a2e8855b5f901f8d853a1a5d4c5f8371   313395:
 adbc481d48ce4e06ac0df8de17159992d4d60682   313391:
 9bd74c8bac3bcba90f28797dcfec4fa46b3c01d0 v: v3

---
 [refs]                                            |  2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod.c            | 15 +++++++++++++++
 .../arch/arm/plat-omap/include/plat/omap_hwmod.h  |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index df12f3d03b74..f57b80479b94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecc46cfdad7499a21296f0757059c4965f1fbc98
+refs/heads/master: 68c9a95e9253ce1776bd21bf8d37ddf213cced66
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index ebdf0016e536..ff76ef1d7232 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -3633,3 +3633,18 @@ void __init omap_hwmod_init(void)
 
 	inited = true;
 }
+
+/**
+ * omap_hwmod_get_main_clk - get pointer to main clock name
+ * @oh: struct omap_hwmod *
+ *
+ * Returns the main clock name assocated with @oh upon success,
+ * or NULL if @oh is NULL.
+ */
+const char *omap_hwmod_get_main_clk(struct omap_hwmod *oh)
+{
+	if (!oh)
+		return NULL;
+
+	return oh->main_clk;
+}
diff --git a/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h b/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 30f55eb8b0bc..6132972aff37 100644
--- a/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -648,6 +648,8 @@ int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx);
 
 extern void __init omap_hwmod_init(void);
 
+const char *omap_hwmod_get_main_clk(struct omap_hwmod *oh);
+
 /*
  * Chip variant-specific hwmod init routines - XXX should be converted
  * to use initcalls once the initial boot ordering is straightened out