Commit 60713996 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/s5pv210-clock 

Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2
parents d16067b2 f64cacc3

arch/arm/mach-s5pv210/clock.c

+711 −122

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/plat-s5p/clock.c

+8 −0
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/plat-s5p/include/plat/s5p-clock.h

+1 −0
Original line number Diff line number Diff line
@@ -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;