Commit 7a2c5cb0 authored by eric miao's avatar eric miao Committed by Russell King
Browse files

[ARM] pxa: make PXA3xx_CK() and PXA3xx_CKEN() public in clock.h 



So processor specific clock sources can be defined in pxa300.c
and pxa320.c.

Signed-off-by: default avatareric miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 566b450c

arch/arm/mach-pxa/clock.h

+24 −0
Original line number Diff line number Diff line
@@ -52,4 +52,28 @@ extern const struct clkops clk_cken_ops; 
void clk_cken_enable(struct clk *clk);

void clk_cken_disable(struct clk *clk);



#ifdef CONFIG_PXA3xx

#define PXA3xx_CKEN(_name, _cken, _rate, _delay, _dev)	\

	{						\

		.name	= _name,			\

		.dev	= _dev,				\

		.ops	= &clk_pxa3xx_cken_ops,		\

		.rate	= _rate,			\

		.cken	= CKEN_##_cken,			\

		.delay	= _delay,			\

	}



#define PXA3xx_CK(_name, _cken, _ops, _dev)		\

	{						\

		.name	= _name,			\

		.dev	= _dev,				\

		.ops	= _ops,				\

		.cken	= CKEN_##_cken,			\

	}



extern const struct clkops clk_pxa3xx_cken_ops;

extern void clk_pxa3xx_cken_enable(struct clk *);

extern void clk_pxa3xx_cken_disable(struct clk *);

#endif



void clks_register(struct clk *clks, size_t num);

arch/arm/mach-pxa/pxa3xx.c

+3 −21
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static unsigned long clk_pxa3xx_hsio_getrate(struct clk *clk) 
	return hsio_clk;

}



static void clk_pxa3xx_cken_enable(struct clk *clk)

void clk_pxa3xx_cken_enable(struct clk *clk)

{

	unsigned long mask = 1ul << (clk->cken & 0x1f);
@@ -154,7 +154,7 @@ static void clk_pxa3xx_cken_enable(struct clk *clk) 
		CKENB |= mask;

}



static void clk_pxa3xx_cken_disable(struct clk *clk)

void clk_pxa3xx_cken_disable(struct clk *clk)

{

	unsigned long mask = 1ul << (clk->cken & 0x1f);
@@ -164,7 +164,7 @@ static void clk_pxa3xx_cken_disable(struct clk *clk) 
		CKENB &= ~mask;

}



static const struct clkops clk_pxa3xx_cken_ops = {

const struct clkops clk_pxa3xx_cken_ops = {

	.enable		= clk_pxa3xx_cken_enable,

	.disable	= clk_pxa3xx_cken_disable,

};
@@ -196,24 +196,6 @@ static const struct clkops clk_pout_ops = { 
	.disable	= clk_pout_disable,

};



#define PXA3xx_CKEN(_name, _cken, _rate, _delay, _dev)	\

	{						\

		.name	= _name,			\

		.dev	= _dev,				\

		.ops	= &clk_pxa3xx_cken_ops,		\

		.rate	= _rate,			\

		.cken	= CKEN_##_cken,			\

		.delay	= _delay,			\

	}



#define PXA3xx_CK(_name, _cken, _ops, _dev)		\

	{						\

		.name	= _name,			\

		.dev	= _dev,				\

		.ops	= _ops,				\

		.cken	= CKEN_##_cken,			\

	}



static struct clk pxa3xx_clks[] = {

	{

		.name           = "CLK_POUT",