git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-w90x900
/
clock.h
diff --git
a/arch/arm/mach-w90x900/clock.h
b/arch/arm/mach-w90x900/clock.h
index
4f27bda
..
f5816a0
100644
(file)
--- a/
arch/arm/mach-w90x900/clock.h
+++ b/
arch/arm/mach-w90x900/clock.h
@@
-12,7
+12,8
@@
#include <asm/clkdev.h>
#include <asm/clkdev.h>
-void w90x900_clk_enable(struct clk *clk, int enable);
+void nuc900_clk_enable(struct clk *clk, int enable);
+void nuc900_subclk_enable(struct clk *clk, int enable);
void clks_register(struct clk_lookup *clks, size_t num);
struct clk {
void clks_register(struct clk_lookup *clks, size_t num);
struct clk {
@@
-23,10
+24,17
@@
struct clk {
#define DEFINE_CLK(_name, _ctrlbit) \
struct clk clk_##_name = { \
#define DEFINE_CLK(_name, _ctrlbit) \
struct clk clk_##_name = { \
- .enable =
w90x900_clk_enable,
\
+ .enable =
nuc900_clk_enable,
\
.cken = (1 << _ctrlbit), \
}
.cken = (1 << _ctrlbit), \
}
+#define DEFINE_SUBCLK(_name, _ctrlbit) \
+struct clk clk_##_name = { \
+ .enable = nuc900_subclk_enable, \
+ .cken = (1 << _ctrlbit), \
+ }
+
+
#define DEF_CLKLOOK(_clk, _devname, _conname) \
{ \
.clk = _clk, \
#define DEF_CLKLOOK(_clk, _devname, _conname) \
{ \
.clk = _clk, \