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

Commit 48cd30b4 authored by Alexandre Bailon's avatar Alexandre Bailon Committed by Sekhar Nori
Browse files

ARM: davinci: Make __clk_{enable,disable} functions public 



In some cases, there is a need to enable a clock as part of
clock enable callback of a different clock. For example, USB
2.0 PHY clock enable requires USB 2.0 clock to be enabled.
In this case, it is safe to instead call __clk_enable()
since the clock framework lock is already taken. Calling
clk_enable() causes recursive locking error.

A similar case arises in the clock disable path.

To enable such usage, make __clk_{enable,disable} functions
publicly available outside of clock.c. Also, call them
davinci_clk_{enable|disable} now to be consistent with how
other davinci-specific clock functions are named.

Note that these functions are not exported to drivers. They
are meant for usage in platform specific clock management
code.

Signed-off-by: default avatarAlexandre Bailon <abailon@baylibre.com>
Suggested-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent ef37427a

arch/arm/mach-davinci/clock.c

+6 −6
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ static LIST_HEAD(clocks); 
static DEFINE_MUTEX(clocks_mutex);

static DEFINE_SPINLOCK(clockfw_lock);



static void __clk_enable(struct clk *clk)

void davinci_clk_enable(struct clk *clk)

{

	if (clk->parent)

		__clk_enable(clk->parent);

		davinci_clk_enable(clk->parent);

	if (clk->usecount++ == 0) {

		if (clk->flags & CLK_PSC)

			davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
@@ -44,7 +44,7 @@ static void __clk_enable(struct clk *clk) 
	}

}



static void __clk_disable(struct clk *clk)

void davinci_clk_disable(struct clk *clk)

{

	if (WARN_ON(clk->usecount == 0))

		return;
@@ -56,7 +56,7 @@ static void __clk_disable(struct clk *clk) 
			clk->clk_disable(clk);

	}

	if (clk->parent)

		__clk_disable(clk->parent);

		davinci_clk_disable(clk->parent);

}



int davinci_clk_reset(struct clk *clk, bool reset)
@@ -103,7 +103,7 @@ int clk_enable(struct clk *clk) 
		return -EINVAL;



	spin_lock_irqsave(&clockfw_lock, flags);

	__clk_enable(clk);

	davinci_clk_enable(clk);

	spin_unlock_irqrestore(&clockfw_lock, flags);



	return 0;
@@ -118,7 +118,7 @@ void clk_disable(struct clk *clk) 
		return;



	spin_lock_irqsave(&clockfw_lock, flags);

	__clk_disable(clk);

	davinci_clk_disable(clk);

	spin_unlock_irqrestore(&clockfw_lock, flags);

}

EXPORT_SYMBOL(clk_disable);

arch/arm/mach-davinci/clock.h

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ int davinci_set_sysclk_rate(struct clk *clk, unsigned long rate); 
int davinci_set_refclk_rate(unsigned long rate);

int davinci_simple_set_rate(struct clk *clk, unsigned long rate);

int davinci_clk_reset(struct clk *clk, bool reset);

void davinci_clk_enable(struct clk *clk);

void davinci_clk_disable(struct clk *clk);



extern struct platform_device davinci_wdt_device;

extern void davinci_watchdog_reset(struct platform_device *);