aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap_hwmod.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2012-06-18 14:12:23 -0400
committerPaul Walmsley <paul@pwsan.com>2012-06-18 14:12:23 -0400
commit3d9f032724e72851c6de38d026b2417501a2f240 (patch)
tree588c2c9d636efc09e07e99d5a54b16b78cb6647c /arch/arm/mach-omap2/omap_hwmod.c
parent485802a6c524e62b5924849dd727ddbb1497cc71 (diff)
ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
_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>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index bf86f7e8f91f..939032a427fd 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -771,13 +771,13 @@ static void _disable_optional_clocks(struct omap_hwmod *oh)
771} 771}
772 772
773/** 773/**
774 * _enable_module - enable CLKCTRL modulemode on OMAP4 774 * _omap4_enable_module - enable CLKCTRL modulemode on OMAP4
775 * @oh: struct omap_hwmod * 775 * @oh: struct omap_hwmod *
776 * 776 *
777 * Enables the PRCM module mode related to the hwmod @oh. 777 * Enables the PRCM module mode related to the hwmod @oh.
778 * No return value. 778 * No return value.
779 */ 779 */
780static void _enable_module(struct omap_hwmod *oh) 780static void _omap4_enable_module(struct omap_hwmod *oh)
781{ 781{
782 /* The module mode does not exist prior OMAP4 */ 782 /* The module mode does not exist prior OMAP4 */
783 if (cpu_is_omap24xx() || cpu_is_omap34xx()) 783 if (cpu_is_omap24xx() || cpu_is_omap34xx())
@@ -786,8 +786,8 @@ static void _enable_module(struct omap_hwmod *oh)
786 if (!oh->clkdm || !oh->prcm.omap4.modulemode) 786 if (!oh->clkdm || !oh->prcm.omap4.modulemode)
787 return; 787 return;
788 788
789 pr_debug("omap_hwmod: %s: _enable_module: %d\n", 789 pr_debug("omap_hwmod: %s: %s: %d\n",
790 oh->name, oh->prcm.omap4.modulemode); 790 oh->name, __func__, oh->prcm.omap4.modulemode);
791 791
792 omap4_cminst_module_enable(oh->prcm.omap4.modulemode, 792 omap4_cminst_module_enable(oh->prcm.omap4.modulemode,
793 oh->clkdm->prcm_partition, 793 oh->clkdm->prcm_partition,
@@ -1814,7 +1814,7 @@ static int _enable(struct omap_hwmod *oh)
1814 } 1814 }
1815 1815
1816 _enable_clocks(oh); 1816 _enable_clocks(oh);
1817 _enable_module(oh); 1817 _omap4_enable_module(oh);
1818 1818
1819 r = _wait_target_ready(oh); 1819 r = _wait_target_ready(oh);
1820 if (!r) { 1820 if (!r) {