aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/clock.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2009-12-08 18:29:37 -0500
committerpaul <paul@twilight.(none)>2009-12-11 19:00:40 -0500
commit6f62b58dd4e697a23a308f5b77781394949d333e (patch)
treed044429e3655732e47bd3458b95ee8bc1c220929 /arch/arm/mach-omap1/clock.c
parentd8a944582da1a4d29a1487ff7f435643505a12a0 (diff)
OMAP1 clock: convert test in disable_unused() to use ENABLE_ON_INIT
mach-omap1/clock.c:omap1_clk_disable_unused() contains a test that assumes that the clock structures are available in the file's namespace. After a following patch, this will no longer be the case. So we need to reimplement that test. It turns out that we already have a facility in the clock framework to handle this case - the ENABLE_ON_INIT flag - used on OMAP2/3. Remove the offending test and mark the clocks that it was intended to catch as ENABLE_ON_INIT. Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
-rw-r--r--arch/arm/mach-omap1/clock.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index e006493fe6e3..26a887ccda7b 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -718,17 +718,6 @@ static void __init omap1_clk_disable_unused(struct clk *clk)
718 if ((regval32 & (1 << clk->enable_bit)) == 0) 718 if ((regval32 & (1 << clk->enable_bit)) == 0)
719 return; 719 return;
720 720
721 /* FIXME: This clock seems to be necessary but no-one
722 * has asked for its activation. */
723 if (clk == &tc2_ck /* FIX: pm.c (SRAM), CCP, Camera */
724 || clk == &ck_dpll1out.clk /* FIX: SoSSI, SSR */
725 || clk == &arm_gpio_ck /* FIX: GPIO code for 1510 */
726 ) {
727 printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n",
728 clk->name);
729 return;
730 }
731
732 printk(KERN_INFO "Disabling unused clock \"%s\"... ", clk->name); 721 printk(KERN_INFO "Disabling unused clock \"%s\"... ", clk->name);
733 clk->ops->disable(clk); 722 clk->ops->disable(clk);
734 printk(" done\n"); 723 printk(" done\n");