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

Commit 1d42460a authored by Jernej Škrabec's avatar Jernej Škrabec Committed by Chen-Yu Tsai
Browse files

clk: sunxi-ng: Wait for lock when using fractional mode 



Currently ccu_frac_helper_set_rate() doesn't wait for a lock bit to be
set before returning. Because of that, unstable clock may be used.

Add a wait for lock in the helper function.

Fixes: 89a3dfb7 ("clk: sunxi-ng: Add fractional lib")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
parent b655f36e

drivers/clk/sunxi-ng/ccu_frac.c

+3 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ unsigned long ccu_frac_helper_read_rate(struct ccu_common *common, 


int ccu_frac_helper_set_rate(struct ccu_common *common,

			     struct ccu_frac_internal *cf,

			     unsigned long rate)

			     unsigned long rate, u32 lock)

{

	unsigned long flags;

	u32 reg, sel;
@@ -106,5 +106,7 @@ int ccu_frac_helper_set_rate(struct ccu_common *common, 
	writel(reg | sel, common->base + common->reg);

	spin_unlock_irqrestore(common->lock, flags);



	ccu_helper_wait_for_lock(common, lock);



	return 0;

}

drivers/clk/sunxi-ng/ccu_frac.h

+1 −1
Original line number Diff line number Diff line
@@ -48,6 +48,6 @@ unsigned long ccu_frac_helper_read_rate(struct ccu_common *common, 


int ccu_frac_helper_set_rate(struct ccu_common *common,

			     struct ccu_frac_internal *cf,

			     unsigned long rate);

			     unsigned long rate, u32 lock);



#endif /* _CCU_FRAC_H_ */

drivers/clk/sunxi-ng/ccu_mult.c

+2 −1
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate, 
	if (ccu_frac_helper_has_rate(&cm->common, &cm->frac, rate)) {

		ccu_frac_helper_enable(&cm->common, &cm->frac);



		return ccu_frac_helper_set_rate(&cm->common, &cm->frac, rate);

		return ccu_frac_helper_set_rate(&cm->common, &cm->frac,

						rate, cm->lock);

	} else {

		ccu_frac_helper_disable(&cm->common, &cm->frac);

	}

drivers/clk/sunxi-ng/ccu_nm.c

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate, 


		ccu_frac_helper_enable(&nm->common, &nm->frac);



		return ccu_frac_helper_set_rate(&nm->common, &nm->frac, rate);

		return ccu_frac_helper_set_rate(&nm->common, &nm->frac,

						rate, nm->lock);

	} else {

		ccu_frac_helper_disable(&nm->common, &nm->frac);

	}