diff options
| author | Ben Dooks | 2010-05-19 11:04:10 +0200 |
|---|---|---|
| committer | Ben Dooks | 2010-05-19 11:04:10 +0200 |
| commit | 6071399674e813d797d9f458ec8913b86c85398e (patch) | |
| tree | d4d178b3ef312a41536d0db8288e9b1555a4c5b4 /arch/arm/plat-s5p | |
| parent | ARM: Merge for-2635/s5p6440-clock (diff) | |
| parent | ARM: S5PV210: Add sclk clocks of type 'struct clksrc_clk' clock (diff) | |
| download | kernel-qcow2-linux-6071399674e813d797d9f458ec8913b86c85398e.tar.gz kernel-qcow2-linux-6071399674e813d797d9f458ec8913b86c85398e.tar.xz kernel-qcow2-linux-6071399674e813d797d9f458ec8913b86c85398e.zip | |
ARM: Merge for-2635/s5pv210-clock
Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-s5p')
| -rw-r--r-- | arch/arm/plat-s5p/clock.c | 8 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/include/plat/s5p-clock.h | 1 |
2 files changed, 9 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 = { .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", @@ -138,6 +145,7 @@ static struct clk *s5p_clks[] __initdata = { &clk_fout_apll, &clk_fout_mpll, &clk_fout_epll, + &clk_fout_vpll, &clk_arm, &clk_vpll, }; diff --git a/arch/arm/plat-s5p/include/plat/s5p-clock.h b/arch/arm/plat-s5p/include/plat/s5p-clock.h index a476a9f14697..aa0447a18903 100644 --- a/arch/arm/plat-s5p/include/plat/s5p-clock.h +++ b/arch/arm/plat-s5p/include/plat/s5p-clock.h @@ -28,6 +28,7 @@ extern struct clk clk_48m; extern struct clk clk_fout_apll; extern struct clk clk_fout_mpll; extern struct clk clk_fout_epll; +extern struct clk clk_fout_vpll; extern struct clk clk_arm; extern struct clk clk_vpll; |