diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-07-06 00:58:43 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-07-06 00:58:43 -0700 |
| commit | 68c9a95e9253ce1776bd21bf8d37ddf213cced66 (patch) | |
| tree | 286f516466c6c4ceaa404dfb97edbd4a393451f9 /arch/arm/mach-omap2 | |
| parent | ecc46cfdad7499a21296f0757059c4965f1fbc98 (diff) | |
| download | linux-68c9a95e9253ce1776bd21bf8d37ddf213cced66.tar.bz2 | |
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
Commit ac5b0ea3d (Merge tag 'omap-devel-f-for-3.6'...) had a merge
conflict that somehow got incorrecly resolved in a lossy way for
commit bed9d1bb (ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API).
Fix the issue by applying the missing pieces.
Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index ebdf0016e536..ff76ef1d7232 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/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; +} |