diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:10 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:10 -0400 |
commit | 6071399674e813d797d9f458ec8913b86c85398e (patch) | |
tree | d4d178b3ef312a41536d0db8288e9b1555a4c5b4 /arch/arm/plat-s5p/clock.c | |
parent | d16067b25e17d38ee11f5760f90edcecc4c77c09 (diff) | |
parent | f64cacc3194f49c7371e2ce61c22de62b8652dc7 (diff) |
ARM: Merge for-2635/s5pv210-clock
Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-s5p/clock.c')
-rw-r--r-- | arch/arm/plat-s5p/clock.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c index 3fef951445dc..a8bfabf4b6bc 100644 --- a/arch/arm/plat-s5p/clock.c +++ b/arch/arm/plat-s5p/clock.c | |||
@@ -74,6 +74,13 @@ struct clk clk_fout_epll = { | |||
74 | .ctrlbit = (1 << 31), | 74 | .ctrlbit = (1 << 31), |
75 | }; | 75 | }; |
76 | 76 | ||
77 | /* VPLL clock output */ | ||
78 | struct clk clk_fout_vpll = { | ||
79 | .name = "fout_vpll", | ||
80 | .id = -1, | ||
81 | .ctrlbit = (1 << 31), | ||
82 | }; | ||
83 | |||
77 | /* ARM clock */ | 84 | /* ARM clock */ |
78 | struct clk clk_arm = { | 85 | struct clk clk_arm = { |
79 | .name = "armclk", | 86 | .name = "armclk", |
@@ -138,6 +145,7 @@ static struct clk *s5p_clks[] __initdata = { | |||
138 | &clk_fout_apll, | 145 | &clk_fout_apll, |
139 | &clk_fout_mpll, | 146 | &clk_fout_mpll, |
140 | &clk_fout_epll, | 147 | &clk_fout_epll, |
148 | &clk_fout_vpll, | ||
141 | &clk_arm, | 149 | &clk_arm, |
142 | &clk_vpll, | 150 | &clk_vpll, |
143 | }; | 151 | }; |