Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb216de authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C64XX: Tidy register and disable clock usage 



This patch changes the clock registration code to use the s3c_register_clocks()
followed by s3c_disable_clocks() instead of the loops it was using.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 387c31c7

arch/arm/mach-s3c64xx/clock.c

+3 −16
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int s3c64xx_sclk_ctrl(struct clk *clk, int enable) 
	return s3c64xx_gate(S3C_SCLK_GATE, clk, enable);

}



static struct clk init_clocks_disable[] = {

static struct clk init_clocks_off[] = {

	{

		.name		= "nand",

		.id		= -1,
@@ -834,10 +834,6 @@ static struct clk *clks[] __initdata = { 
void __init s3c64xx_register_clocks(unsigned long xtal, 

				    unsigned armclk_divlimit)

{

	struct clk *clkp;

	int ret;

	int ptr;



	armclk_mask = armclk_divlimit;



	s3c24xx_register_baseclocks(xtal);
@@ -845,17 +841,8 @@ void __init s3c64xx_register_clocks(unsigned long xtal, 


	s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));



	clkp = init_clocks_disable;

	for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {



		ret = s3c24xx_register_clock(clkp);

		if (ret < 0) {

			printk(KERN_ERR "Failed to register clock %s (%d)\n",

			       clkp->name, ret);

		}



		(clkp->enable)(clkp, 0);

	}

	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));



	s3c24xx_register_clocks(clks1, ARRAY_SIZE(clks1));

	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));