Skip to content

Commit

Permalink
ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
Browse files Browse the repository at this point in the history
_enable_module is specific to SoCs with PRCM interfaces similar to
that of the OMAP4, so rename it to be consistent with the
corresponding _omap4_disable_module.

Signed-off-by: Kevin Hilman <khilman@ti.com>
[paul@pwsan.com: tweaked commit message]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
  • Loading branch information
Kevin Hilman authored and Paul Walmsley committed Jun 18, 2012
1 parent 485802a commit 3d9f032
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/arm/mach-omap2/omap_hwmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -771,13 +771,13 @@ static void _disable_optional_clocks(struct omap_hwmod *oh)
}

/**
* _enable_module - enable CLKCTRL modulemode on OMAP4
* _omap4_enable_module - enable CLKCTRL modulemode on OMAP4
* @oh: struct omap_hwmod *
*
* Enables the PRCM module mode related to the hwmod @oh.
* No return value.
*/
static void _enable_module(struct omap_hwmod *oh)
static void _omap4_enable_module(struct omap_hwmod *oh)
{
/* The module mode does not exist prior OMAP4 */
if (cpu_is_omap24xx() || cpu_is_omap34xx())
Expand All @@ -786,8 +786,8 @@ static void _enable_module(struct omap_hwmod *oh)
if (!oh->clkdm || !oh->prcm.omap4.modulemode)
return;

pr_debug("omap_hwmod: %s: _enable_module: %d\n",
oh->name, oh->prcm.omap4.modulemode);
pr_debug("omap_hwmod: %s: %s: %d\n",
oh->name, __func__, oh->prcm.omap4.modulemode);

omap4_cminst_module_enable(oh->prcm.omap4.modulemode,
oh->clkdm->prcm_partition,
Expand Down Expand Up @@ -1814,7 +1814,7 @@ static int _enable(struct omap_hwmod *oh)
}

_enable_clocks(oh);
_enable_module(oh);
_omap4_enable_module(oh);

r = _wait_target_ready(oh);
if (!r) {
Expand Down

0 comments on commit 3d9f032

Please sign in to comment.