Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c9a95e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API 



Commit ac5b0ea3 (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: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ecc46cfd

arch/arm/mach-omap2/omap_hwmod.c

+15 −0
Original line number Diff line number Diff line
@@ -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;

}

arch/arm/plat-omap/include/plat/omap_hwmod.h

+2 −0
Original line number Diff line number Diff line
@@ -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