redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: Merge for-2635/s5pv210-clock

Browse source 
Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2
This commit is contained in:
Ben Dooks 2010-05-19 18:04:10 +09:00
parent d16067b25e f64cacc319
commit 6071399674
3 changed files with 895 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1183
arch/arm/mach-s5pv210/clock.c
View file

File diff suppressed because it is too large Load diff

8
arch/arm/plat-s5p/clock.c
View file

@ -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 */ /* ARM clock */
struct clk clk_arm = { struct clk clk_arm = {
.name = "armclk", .name = "armclk",
@ -138,6 +145,7 @@ static struct clk *s5p_clks[] __initdata = {
&clk_fout_apll, &clk_fout_apll,
&clk_fout_mpll, &clk_fout_mpll,
&clk_fout_epll, &clk_fout_epll,
&clk_fout_vpll,
&clk_arm, &clk_arm,
&clk_vpll, &clk_vpll,
}; };

1
arch/arm/plat-s5p/include/plat/s5p-clock.h
View file

@ -28,6 +28,7 @@ extern struct clk clk_48m;
extern struct clk clk_fout_apll; extern struct clk clk_fout_apll;
extern struct clk clk_fout_mpll; extern struct clk clk_fout_mpll;
extern struct clk clk_fout_epll; extern struct clk clk_fout_epll;
extern struct clk clk_fout_vpll;
extern struct clk clk_arm; extern struct clk clk_arm;
extern struct clk clk_vpll; extern struct clk clk_vpll;