Skip to content

Commit

Permalink
drivers: sh: late disabling of clocks V2
Browse files Browse the repository at this point in the history
This V2 patch changes the clock disabling behavior during boot.
Two different changes are made:

1) Delay disabling of clocks until late in the boot process.
   This fixes an existing issue where in-use clocks without
   software reference are disabled by mistake during boot.
   One example of this is the handling of the Mackerel serial
   console output that shares clock with the I2C controller.

2) Write out the "disabled" state to the hardware for clocks
   that not have been used by the kernel. In other words,
   make sure so far unused clocks actually get turned off.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Jun 24, 2011
1 parent bccaeaf commit 794d78f
Showing 1 changed file with 26 additions and 1 deletion.
27 changes: 26 additions & 1 deletion drivers/sh/clk/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ static LIST_HEAD(clock_list);
static DEFINE_SPINLOCK(clock_lock);
static DEFINE_MUTEX(clock_list_sem);

/* clock disable operations are not passed on to hardware during boot */
static int allow_disable;

void clk_rate_table_build(struct clk *clk,
struct cpufreq_frequency_table *freq_table,
int nr_freqs,
Expand Down Expand Up @@ -228,7 +231,7 @@ static void __clk_disable(struct clk *clk)
return;

if (!(--clk->usecount)) {
if (likely(clk->ops && clk->ops->disable))
if (likely(allow_disable && clk->ops && clk->ops->disable))
clk->ops->disable(clk);
if (likely(clk->parent))
__clk_disable(clk->parent);
Expand Down Expand Up @@ -747,3 +750,25 @@ static int __init clk_debugfs_init(void)
return err;
}
late_initcall(clk_debugfs_init);

static int __init clk_late_init(void)
{
unsigned long flags;
struct clk *clk;

/* disable all clocks with zero use count */
mutex_lock(&clock_list_sem);
spin_lock_irqsave(&clock_lock, flags);

list_for_each_entry(clk, &clock_list, node)
if (!clk->usecount && clk->ops && clk->ops->disable)
clk->ops->disable(clk);

/* from now on allow clock disable operations */
allow_disable = 1;

spin_unlock_irqrestore(&clock_lock, flags);
mutex_unlock(&clock_list_sem);
return 0;
}
late_initcall(clk_late_init);

0 comments on commit 794d78f

Please sign in to comment.