aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-10-29 22:57:31 -0400
committerPaul Walmsley <paul@pwsan.com>2012-11-08 17:09:26 -0500
commit5b78e61b1cf28f061a7989b25180fcef26d31eb8 (patch)
treef7fda7dc674e405c4011dd125ebb7baaf032dcba
parentc4ceedcb18cf7a06059482a3a1828b9aad9f78cf (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.c39
-rw-r--r--arch/arm/plat-omap/include/plat/prcm.h2
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;
45void __iomem *cm2_base; 45void __iomem *cm2_base;
46void __iomem *prcm_mpu_base; 46void __iomem *prcm_mpu_base;
47 47
48#define MAX_MODULE_ENABLE_WAIT 100000
49
50/**
51 * omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness
52 * @reg: physical address of module IDLEST register
53 * @mask: value to mask against to determine if the module is active
54 * @idlest: idle state indicator (0 or 1) for the clock
55 * @name: name of the clock (for printk)
56 *
57 * Returns 1 if the module indicated readiness in time, or 0 if it
58 * failed to enable in roughly MAX_MODULE_ENABLE_WAIT microseconds.
59 *
60 * XXX This function is deprecated. It should be removed once the
61 * hwmod conversion is complete.
62 */
63int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest,
64 const char *name)
65{
66 int i = 0;
67 int ena = 0;
68
69 if (idlest)
70 ena = 0;
71 else
72 ena = mask;
73
74 /* Wait for lock */
75 omap_test_timeout(((__raw_readl(reg) & mask) == ena),
76 MAX_MODULE_ENABLE_WAIT, i);
77
78 if (i < MAX_MODULE_ENABLE_WAIT)
79 pr_debug("cm: Module associated with clock %s ready after %d loops\n",
80 name, i);
81 else
82 pr_err("cm: Module associated with clock %s didn't enable in %d tries\n",
83 name, MAX_MODULE_ENABLE_WAIT);
84
85 return (i < MAX_MODULE_ENABLE_WAIT) ? 1 : 0;
86};
87 48
88void __init omap2_set_globals_prcm(void __iomem *prm, void __iomem *cm, 49void __init omap2_set_globals_prcm(void __iomem *prm, void __iomem *cm,
89 void __iomem *cm2, void __iomem *prcm_mpu) 50 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 @@
30#include <linux/kernel.h> 30#include <linux/kernel.h>
31#include <linux/io.h> 31#include <linux/io.h>
32 32
33int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest,
34 const char *name);
35void __init omap2_set_globals_prcm(void __iomem *prm, void __iomem *cm, 33void __init omap2_set_globals_prcm(void __iomem *prm, void __iomem *cm,
36 void __iomem *cm2, void __iomem *prcm_mpu); 34 void __iomem *cm2, void __iomem *prcm_mpu);
37 35