diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-10-29 20:57:31 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-08 15:09:26 -0700 |
| commit | 5b78e61b1cf28f061a7989b25180fcef26d31eb8 (patch) | |
| tree | f7fda7dc674e405c4011dd125ebb7baaf032dcba | |
| parent | c4ceedcb18cf7a06059482a3a1828b9aad9f78cf (diff) | |
ARM: OMAP2+: PRCM: remove omap2_cm_wait_idlest()
Now that all users of mach-omap2/omap2_cm_wait_idlest() have been removed,
delete the function and its supporting macros and prototypes.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/prcm.c | 39 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/prcm.h | 2 |
2 files changed, 0 insertions, 41 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 7782e0f88a31..75a7246c7bbe 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -45,45 +45,6 @@ void __iomem *cm_base; void __iomem *cm2_base; void __iomem *prcm_mpu_base; -#define MAX_MODULE_ENABLE_WAIT 100000 - -/** - * omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness - * @reg: physical address of module IDLEST register - * @mask: value to mask against to determine if the module is active - * @idlest: idle state indicator (0 or 1) for the clock - * @name: name of the clock (for printk) - * - * Returns 1 if the module indicated readiness in time, or 0 if it - * failed to enable in roughly MAX_MODULE_ENABLE_WAIT microseconds. - * - * XXX This function is deprecated. It should be removed once the - * hwmod conversion is complete. - */ -int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, - const char *name) -{ - int i = 0; - int ena = 0; - - if (idlest) - ena = 0; - else - ena = mask; - - /* Wait for lock */ - omap_test_timeout(((__raw_readl(reg) & mask) == ena), - MAX_MODULE_ENABLE_WAIT, i); - - if (i < MAX_MODULE_ENABLE_WAIT) - pr_debug("cm: Module associated with clock %s ready after %d loops\n", - name, i); - else - pr_err("cm: Module associated with clock %s didn't enable in %d tries\n", - name, MAX_MODULE_ENABLE_WAIT); - - return (i < MAX_MODULE_ENABLE_WAIT) ? 1 : 0; -}; void __init omap2_set_globals_prcm(void __iomem *prm, void __iomem *cm, void __iomem *cm2, void __iomem *prcm_mpu) diff --git a/arch/arm/plat-omap/include/plat/prcm.h b/arch/arm/plat-omap/include/plat/prcm.h index a950a8367e7f..3ccee9f192c8 100644 --- a/arch/arm/plat-omap/include/plat/prcm.h +++ b/arch/arm/plat-omap/include/plat/prcm.h @@ -30,8 +30,6 @@ #include <linux/kernel.h> #include <linux/io.h> -int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, - const char *name); void __init omap2_set_globals_prcm(void __iomem *prm, void __iomem *cm, void __iomem *cm2, void __iomem *prcm_mpu); |