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

Commit fb6e76cd authored by Ben Dooks's avatar Ben Dooks Committed by Ben Dooks
Browse files

ARM: SAMSUNG: Do not allow get/set/round rate calls with no divider 



If the reg_div field is not set, then do not register clk_ops with the
get/set/round rate calls as these will fail to work.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 2c2f69b1

arch/arm/plat-samsung/clock-clksrc.c

+13 −2
Original line number Diff line number Diff line
@@ -158,14 +158,25 @@ static struct clk_ops clksrc_ops = { 
	.round_rate	= s3c_roundrate_clksrc,

};



static struct clk_ops clksrc_ops_nodiv = {

	.set_parent	= s3c_setparent_clksrc,

};



void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size)

{

	int ret;



	WARN_ON(!clksrc->reg_div.reg && !clksrc->reg_src.reg);



	for (; size > 0; size--, clksrc++) {

		/* fill in the default functions */

		if (!clksrc->clk.ops)



		if (!clksrc->clk.ops) {

			if (!clksrc->reg_div.reg)

				clksrc->clk.ops = &clksrc_ops_nodiv;

			else

				clksrc->clk.ops = &clksrc_ops;

		}



		/* setup the clocksource, but do not announce it

		 * as it may be re-set by the setup routines