lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
eric miao
2008-02-19 11:13:31 +08:00
committed by Russell King
parent 566b450c33
commit 7a2c5cb0e2
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/mach-pxa/clock.h
View File

@@ -52,4 +52,28 @@ extern const struct clkops clk_cken_ops;
void clk_cken_enable(struct clk *clk); void clk_cken_enable(struct clk *clk);
void clk_cken_disable(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); void clks_register(struct clk *clks, size_t num);

24
arch/arm/mach-pxa/pxa3xx.c
View File

@@ -144,7 +144,7 @@ static unsigned long clk_pxa3xx_hsio_getrate(struct clk *clk)
return hsio_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); unsigned long mask = 1ul << (clk->cken & 0x1f);
@@ -154,7 +154,7 @@ static void clk_pxa3xx_cken_enable(struct clk *clk)
CKENB |= mask; 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); unsigned long mask = 1ul << (clk->cken & 0x1f);
@@ -164,7 +164,7 @@ static void clk_pxa3xx_cken_disable(struct clk *clk)
CKENB &= ~mask; CKENB &= ~mask;
} }
static const struct clkops clk_pxa3xx_cken_ops = { const struct clkops clk_pxa3xx_cken_ops = {
.enable = clk_pxa3xx_cken_enable, .enable = clk_pxa3xx_cken_enable,
.disable = clk_pxa3xx_cken_disable, .disable = clk_pxa3xx_cken_disable,
}; };
@@ -196,24 +196,6 @@ static const struct clkops clk_pout_ops = {
.disable = clk_pout_disable, .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[] = { static struct clk pxa3xx_clks[] = {
{ {
.name = "CLK_POUT", .name = "CLK_POUT",