diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-07-05 13:13:04 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-07-05 13:13:04 +0400 |
| commit | ac5b0ea3d00d231dd9cedd45636b29defc368a4c (patch) | |
| tree | 9649d193558e7c662257063a77ab7422379ac45b /arch/arm/mach-omap2/cminst44xx.c | |
| parent | 3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c (diff) | |
| parent | 8cb8de5d87b75f2ecaa1189079764340ea366c0e (diff) | |
| download | linux-ac5b0ea3d00d231dd9cedd45636b29defc368a4c.tar.xz | |
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-part2
Miscellaneous OMAP clock, hwmod, clockdomain, and powerdomain patches
for 3.6. Mostly small infrastructure improvements, and preparation
for OMAP5 and AM33xx code.
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 1a39945d9ff8..1894015ff04b 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -235,20 +235,6 @@ void omap4_cminst_clkdm_disable_hwsup(u8 part, s16 inst, u16 cdoffs) } /** - * omap4_cminst_clkdm_force_sleep - try to put a clockdomain into idle - * @part: PRCM partition ID that the clockdomain registers exist in - * @inst: CM instance register offset (*_INST macro) - * @cdoffs: Clockdomain register offset (*_CDOFFS macro) - * - * Put a clockdomain referred to by (@part, @inst, @cdoffs) into idle - * No return value. - */ -void omap4_cminst_clkdm_force_sleep(u8 part, s16 inst, u16 cdoffs) -{ - _clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_SLEEP, part, inst, cdoffs); -} - -/** * omap4_cminst_clkdm_force_sleep - try to take a clockdomain out of idle * @part: PRCM partition ID that the clockdomain registers exist in * @inst: CM instance register offset (*_INST macro) |