projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Merge for-2635/s5pv210-clock
[deliverable/linux.git]
/
arch
/
arm
/
plat-s5p
/
clock.c
diff --git
a/arch/arm/plat-s5p/clock.c
b/arch/arm/plat-s5p/clock.c
index 3fef951445dcc8277e90fc18963f23e9faac7c89..a8bfabf4b6bcbc7f0dd40a6ddd7b6b490e4541d9 100644
(file)
--- a/
arch/arm/plat-s5p/clock.c
+++ b/
arch/arm/plat-s5p/clock.c
@@
-74,6
+74,13
@@
struct clk clk_fout_epll = {
.ctrlbit = (1 << 31),
};
.ctrlbit = (1 << 31),
};
+/* VPLL clock output */
+struct clk clk_fout_vpll = {
+ .name = "fout_vpll",
+ .id = -1,
+ .ctrlbit = (1 << 31),
+};
+
/* ARM clock */
struct clk clk_arm = {
.name = "armclk",
/* ARM clock */
struct clk clk_arm = {
.name = "armclk",
@@
-138,6
+145,7
@@
static struct clk *s5p_clks[] __initdata = {
&clk_fout_apll,
&clk_fout_mpll,
&clk_fout_epll,
&clk_fout_apll,
&clk_fout_mpll,
&clk_fout_epll,
+ &clk_fout_vpll,
&clk_arm,
&clk_vpll,
};
&clk_arm,
&clk_vpll,
};
This page took
0.028333 seconds
and
5
git commands to generate.