diff options
author | Paul Walmsley <paul@pwsan.com> | 2009-12-09 00:29:37 +0100 |
---|---|---|
committer | paul <paul@twilight.(none)> | 2009-12-12 01:00:40 +0100 |
commit | 6f62b58dd4e697a23a308f5b77781394949d333e (patch) | |
tree | d044429e3655732e47bd3458b95ee8bc1c220929 /arch/arm/mach-omap1/clock.c | |
parent | OMAP2 clock: convert clock24xx.h to clock2xxx_data.c, opp2xxx* (diff) | |
download | linux-6f62b58dd4e697a23a308f5b77781394949d333e.tar.xz linux-6f62b58dd4e697a23a308f5b77781394949d333e.zip |
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.c | 11 |
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) if ((regval32 & (1 << clk->enable_bit)) == 0) return; - /* FIXME: This clock seems to be necessary but no-one - * has asked for its activation. */ - if (clk == &tc2_ck /* FIX: pm.c (SRAM), CCP, Camera */ - || clk == &ck_dpll1out.clk /* FIX: SoSSI, SSR */ - || clk == &arm_gpio_ck /* FIX: GPIO code for 1510 */ - ) { - printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n", - clk->name); - return; - } - printk(KERN_INFO "Disabling unused clock \"%s\"... ", clk->name); clk->ops->disable(clk); printk(" done\n"); |