| Message ID | 20120706080943.GL1122@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 6, 2012 at 1:39 PM, Tony Lindgren <tony@atomide.com> wrote: > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120705 04:26]: >> >> Looks like the merge has not happened correctly. >> I see from the commit log that, you had a merge conflict in omap_hwmod.c >> and probably while resolving that the below change got missed. >> >> Tarun Kanti DebBarma (1): >> ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API >> >> So I tried pulling Paul's branch again on "cleanup-part2" at commit 8cb8de5d87 >> and it got merged without any conflicts. >> >> Do you want to re-merge Paul's series in cleanup-part2 or re-apply the above >> patch ? > > Hmm weird, I wonder how I managed to mess up the resolve like that.. > I'll (re)apply the following fix as the branch has been pushed out already. > Sounds good to me. Can you update the barcnh please ? I don't see that patch yet in cleanup-part2. Regards santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [120706 01:32]: > On Fri, Jul 6, 2012 at 1:39 PM, Tony Lindgren <tony@atomide.com> wrote: > > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120705 04:26]: > >> > >> Looks like the merge has not happened correctly. > >> I see from the commit log that, you had a merge conflict in omap_hwmod.c > >> and probably while resolving that the below change got missed. > >> > >> Tarun Kanti DebBarma (1): > >> ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API > >> > >> So I tried pulling Paul's branch again on "cleanup-part2" at commit 8cb8de5d87 > >> and it got merged without any conflicts. > >> > >> Do you want to re-merge Paul's series in cleanup-part2 or re-apply the above > >> patch ? > > > > Hmm weird, I wonder how I managed to mess up the resolve like that.. > > I'll (re)apply the following fix as the branch has been pushed out already. > > > Sounds good to me. Can you update the barcnh please ? > I don't see that patch yet in cleanup-part2. Pushed out now at commit ae6df418 (ARM: OMAP2+: dmtimer: cleanup fclk usage) also applied. Might take a while for it to get mirrored. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jul 6, 2012 at 2:00 PM, Tony Lindgren <tony@atomide.com> wrote: > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120706 01:32]: >> On Fri, Jul 6, 2012 at 1:39 PM, Tony Lindgren <tony@atomide.com> wrote: >> > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120705 04:26]: >> >> >> >> Looks like the merge has not happened correctly. >> >> I see from the commit log that, you had a merge conflict in omap_hwmod.c >> >> and probably while resolving that the below change got missed. >> >> >> >> Tarun Kanti DebBarma (1): >> >> ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API >> >> >> >> So I tried pulling Paul's branch again on "cleanup-part2" at commit 8cb8de5d87 >> >> and it got merged without any conflicts. >> >> >> >> Do you want to re-merge Paul's series in cleanup-part2 or re-apply the above >> >> patch ? >> > >> > Hmm weird, I wonder how I managed to mess up the resolve like that.. >> > I'll (re)apply the following fix as the branch has been pushed out already. >> > >> Sounds good to me. Can you update the barcnh please ? >> I don't see that patch yet in cleanup-part2. > > Pushed out now at commit ae6df418 (ARM: OMAP2+: dmtimer: cleanup fclk usage) > also applied. Might take a while for it to get mirrored. > Great. Thanks !! Regards Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index ebdf001..ff76ef1 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; +} diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 30f55eb..6132972 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/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