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

Commit 95ad8ed9 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard
Browse files

clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum mismatch 



In commit 2beaa601 ("clk: sunxi-ng: Implement minimum for
multipliers"), the multiplier minimums in the set_rate callback
for NM and NKMP style clocks were not updated.

This patch fixes them to match their round_rate callbacks.

Fixes: 2beaa601 ("clk: sunxi-ng: Implement minimum for multipliers")
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 4162c5ce

drivers/clk/sunxi-ng/ccu_nkmp.c

+2 −2
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate, 
	unsigned long flags;

	u32 reg;



	_nkmp.min_n = 1;

	_nkmp.min_n = nkmp->n.min ?: 1;

	_nkmp.max_n = nkmp->n.max ?: 1 << nkmp->n.width;

	_nkmp.min_k = 1;

	_nkmp.min_k = nkmp->k.min ?: 1;

	_nkmp.max_k = nkmp->k.max ?: 1 << nkmp->k.width;

	_nkmp.min_m = 1;

	_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;

drivers/clk/sunxi-ng/ccu_nm.c

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

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



	_nm.min_n = 1;

	_nm.min_n = nm->n.min ?: 1;

	_nm.max_n = nm->n.max ?: 1 << nm->n.width;

	_nm.min_m = 1;

	_nm.max_m = nm->m.max ?: 1 << nm->m.width;