Skip to content

Commit

Permalink
clk: sunxi-ng: Implement multiplier maximum
Browse files Browse the repository at this point in the history 
Some multipliers have a maximum rate that is lower than what the register
width allows to. Add a field in the multiplier structure to allow CCU
driver to set that maximum.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Maxime Ripard committed Jan 23, 2017
1 parent c9520be commit 0c3c8e1
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 20 deletions.
14 changes: 12 additions & 2 deletions drivers/clk/sunxi-ng/ccu_mult.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,
struct _ccu_mult _cm;

_cm.min = cm->mult.min;
_cm.max = 1 << cm->mult.width;

if (cm->mult.max)
_cm.max = cm->mult.max;
else
_cm.max = (1 << cm->mult.width) + cm->mult.offset - 1;

ccu_mult_find_best(parent_rate, rate, &_cm);

return parent_rate * _cm.mult;
Expand Down Expand Up @@ -114,7 +119,12 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate,
&parent_rate);

_cm.min = cm->mult.min;
_cm.max = 1 << cm->mult.width;

if (cm->mult.max)
_cm.max = cm->mult.max;
else
_cm.max = (1 << cm->mult.width) + cm->mult.offset - 1;

ccu_mult_find_best(parent_rate, rate, &_cm);

spin_lock_irqsave(cm->common.lock, flags);
Expand Down
10 changes: 6 additions & 4 deletions drivers/clk/sunxi-ng/ccu_mult.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,26 @@ struct ccu_mult_internal {
u8 shift;
u8 width;
u8 min;
u8 max;
};

#define _SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, _offset, _min) \
#define _SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, _offset, _min, _max) \
{ \
.min = _min, \
.max = _max, \
.offset = _offset, \
.shift = _shift, \
.width = _width, \
}

#define _SUNXI_CCU_MULT_MIN(_shift, _width, _min) \
_SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, 1, _min)
_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, 1, _min, 0)

#define _SUNXI_CCU_MULT_OFFSET(_shift, _width, _offset) \
_SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, _offset, 1)
_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, _offset, 1, 0)

#define _SUNXI_CCU_MULT(_shift, _width) \
_SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, 1, 1)
_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, 1, 1, 0)

struct ccu_mult {
u32 enable;
Expand Down
8 changes: 4 additions & 4 deletions drivers/clk/sunxi-ng/ccu_nk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ static long ccu_nk_round_rate(struct clk_hw *hw, unsigned long rate,
rate *= nk->fixed_post_div;

_nk.min_n = nk->n.min;
_nk.max_n = 1 << nk->n.width;
_nk.max_n = nk->n.max ?: 1 << nk->n.width;
_nk.min_k = nk->k.min;
_nk.max_k = 1 << nk->k.width;
_nk.max_k = nk->k.max ?: 1 << nk->k.width;

ccu_nk_find_best(*parent_rate, rate, &_nk);
rate = *parent_rate * _nk.n * _nk.k;
Expand All @@ -128,9 +128,9 @@ static int ccu_nk_set_rate(struct clk_hw *hw, unsigned long rate,
rate = rate * nk->fixed_post_div;

_nk.min_n = nk->n.min;
_nk.max_n = 1 << nk->n.width;
_nk.max_n = nk->n.max ?: 1 << nk->n.width;
_nk.min_k = nk->k.min;
_nk.max_k = 1 << nk->k.width;
_nk.max_k = nk->k.max ?: 1 << nk->k.width;

ccu_nk_find_best(parent_rate, rate, &_nk);

Expand Down
8 changes: 4 additions & 4 deletions drivers/clk/sunxi-ng/ccu_nkm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,
struct _ccu_nkm _nkm;

_nkm.min_n = nkm->n.min;
_nkm.max_n = 1 << nkm->n.width;
_nkm.max_n = nkm->n.max ?: 1 << nkm->n.width;
_nkm.min_k = nkm->k.min;
_nkm.max_k = 1 << nkm->k.width;
_nkm.max_k = nkm->k.max ?: 1 << nkm->k.width;
_nkm.min_m = 1;
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;

Expand All @@ -139,9 +139,9 @@ static int ccu_nkm_set_rate(struct clk_hw *hw, unsigned long rate,
u32 reg;

_nkm.min_n = nkm->n.min;
_nkm.max_n = 1 << nkm->n.width;
_nkm.max_n = nkm->n.max ?: 1 << nkm->n.width;
_nkm.min_k = nkm->k.min;
_nkm.max_k = 1 << nkm->k.width;
_nkm.max_k = nkm->k.max ?: 1 << nkm->k.width;
_nkm.min_m = 1;
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;

Expand Down
8 changes: 4 additions & 4 deletions drivers/clk/sunxi-ng/ccu_nkmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
struct _ccu_nkmp _nkmp;

_nkmp.min_n = nkmp->n.min;
_nkmp.max_n = 1 << nkmp->n.width;
_nkmp.max_n = nkmp->n.max ?: 1 << nkmp->n.width;
_nkmp.min_k = nkmp->k.min;
_nkmp.max_k = 1 << nkmp->k.width;
_nkmp.max_k = nkmp->k.max ?: 1 << nkmp->k.width;
_nkmp.min_m = 1;
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
_nkmp.min_p = 1;
Expand All @@ -139,9 +139,9 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
u32 reg;

_nkmp.min_n = 1;
_nkmp.max_n = 1 << nkmp->n.width;
_nkmp.max_n = nkmp->n.max ?: 1 << nkmp->n.width;
_nkmp.min_k = 1;
_nkmp.max_k = 1 << nkmp->k.width;
_nkmp.max_k = nkmp->k.max ?: 1 << nkmp->k.width;
_nkmp.min_m = 1;
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
_nkmp.min_p = 1;
Expand Down
4 changes: 2 additions & 2 deletions drivers/clk/sunxi-ng/ccu_nm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static long ccu_nm_round_rate(struct clk_hw *hw, unsigned long rate,
struct _ccu_nm _nm;

_nm.min_n = nm->n.min;
_nm.max_n = 1 << nm->n.width;
_nm.max_n = nm->n.max ?: 1 << nm->n.width;
_nm.min_m = 1;
_nm.max_m = nm->m.max ?: 1 << nm->m.width;

Expand All @@ -123,7 +123,7 @@ static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate,
ccu_frac_helper_disable(&nm->common, &nm->frac);

_nm.min_n = 1;
_nm.max_n = 1 << nm->n.width;
_nm.max_n = nm->n.max ?: 1 << nm->n.width;
_nm.min_m = 1;
_nm.max_m = nm->m.max ?: 1 << nm->m.width;

Expand Down

0 comments on commit 0c3c8e1

Please sign in to comment.