Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6041c27f authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks 



Reduce the amount of debugging generated by default when unused clocks
are being disabled by the clock code.  The previous code would only
generate debug-level messages, but some people who wished to run
production kernels with debug-level messages enabled reported that the
large number of clock disable messages were slowing boot.  Now to
enable clock-by-clock disable messages, DEBUG needs to be defined in
mach-omap2/clock.c.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Tuukka Tikkanen <tuukka.tikkanen@nokia.com>
Cc: Tim Bird <tim.bird@am.sony.com>
parent 4814ced5

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ void omap2_clk_disable_unused(struct clk *clk) 
	if ((regval32 & (1 << clk->enable_bit)) == v)

		return;



	printk(KERN_DEBUG "Disabling unused clock \"%s\"\n", clk->name);

	pr_debug("Disabling unused clock \"%s\"\n", clk->name);

	if (cpu_is_omap34xx()) {

		omap2_clk_enable(clk);

		omap2_clk_disable(clk);

arch/arm/plat-omap/clock.c

+3 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void clk_disable(struct clk *clk) 


	spin_lock_irqsave(&clockfw_lock, flags);

	if (clk->usecount == 0) {

		printk(KERN_ERR "Trying disable clock %s with 0 usecount\n",

		pr_err("Trying disable clock %s with 0 usecount\n",

		       clk->name);

		WARN_ON(1);

		goto out;
@@ -397,6 +397,7 @@ static int __init clk_disable_unused(void) 
	struct clk *ck;

	unsigned long flags;



	pr_info("clock: disabling unused clocks to save power\n");

	list_for_each_entry(ck, &clocks, node) {

		if (ck->ops == &clkops_null)

			continue;
@@ -418,7 +419,7 @@ late_initcall(clk_disable_unused); 
int __init clk_init(struct clk_functions * custom_clocks)

{

	if (!custom_clocks) {

		printk(KERN_ERR "No custom clock functions registered\n");

		pr_err("No custom clock functions registered\n");

		BUG();

	}