iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: sunxi-ng: Implement minimum for multipliers

Browse Source 
Allow the CCU drivers to specify a multiplier for their clocks.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
This commit is contained in:
Maxime Ripard 2016-09-30 22:16:51 +02:00
parent 6e0d50daa9
commit 2beaa601c8
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/sunxi-ng/ccu_mult.c
View File

@ -105,7 +105,7 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate,
ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1, ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
&parent_rate); &parent_rate);
_cm.min = 1; _cm.min = cm->mult.min;
_cm.max = 1 << cm->mult.width; _cm.max = 1 << cm->mult.width;
ccu_mult_find_best(parent_rate, rate, &_cm); ccu_mult_find_best(parent_rate, rate, &_cm);

13
drivers/clk/sunxi-ng/ccu_mult.h
View File

@ -7,14 +7,19 @@
struct ccu_mult_internal { struct ccu_mult_internal {
u8 shift; u8 shift;
u8 width; u8 width;
u8 min;
}; };
#define _SUNXI_CCU_MULT(_shift, _width) \ #define _SUNXI_CCU_MULT_MIN(_shift, _width, _min) \
{ \ { \
.shift = _shift, \ .shift = _shift, \
.width = _width, \ .width = _width, \
.min = _min, \
} }
#define _SUNXI_CCU_MULT(_shift, _width) \
_SUNXI_CCU_MULT_MIN(_shift, _width, 1)
struct ccu_mult { struct ccu_mult {
u32 enable; u32 enable;

8
drivers/clk/sunxi-ng/ccu_nk.c
View File

@ -97,9 +97,9 @@ static long ccu_nk_round_rate(struct clk_hw *hw, unsigned long rate,
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV) if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
rate *= nk->fixed_post_div; rate *= nk->fixed_post_div;
_nk.min_n = 1; _nk.min_n = nk->n.min;
_nk.max_n = 1 << nk->n.width; _nk.max_n = 1 << nk->n.width;
_nk.min_k = 1; _nk.min_k = nk->k.min;
_nk.max_k = 1 << nk->k.width; _nk.max_k = 1 << nk->k.width;
ccu_nk_find_best(*parent_rate, rate, &_nk); ccu_nk_find_best(*parent_rate, rate, &_nk);
@ -122,9 +122,9 @@ static int ccu_nk_set_rate(struct clk_hw *hw, unsigned long rate,
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV) if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
rate = rate * nk->fixed_post_div; rate = rate * nk->fixed_post_div;
_nk.min_n = 1; _nk.min_n = nk->n.min;
_nk.max_n = 1 << nk->n.width; _nk.max_n = 1 << nk->n.width;
_nk.min_k = 1; _nk.min_k = nk->k.min;
_nk.max_k = 1 << nk->k.width; _nk.max_k = 1 << nk->k.width;
ccu_nk_find_best(parent_rate, rate, &_nk); ccu_nk_find_best(parent_rate, rate, &_nk);

8
drivers/clk/sunxi-ng/ccu_nkm.c
View File

@ -100,9 +100,9 @@ static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,
struct ccu_nkm *nkm = data; struct ccu_nkm *nkm = data;
struct _ccu_nkm _nkm; struct _ccu_nkm _nkm;
_nkm.min_n = 1; _nkm.min_n = nkm->n.min;
_nkm.max_n = 1 << nkm->n.width; _nkm.max_n = 1 << nkm->n.width;
_nkm.min_k = 1; _nkm.min_k = nkm->k.min;
_nkm.max_k = 1 << nkm->k.width; _nkm.max_k = 1 << nkm->k.width;
_nkm.min_m = 1; _nkm.min_m = 1;
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width; _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
@ -129,9 +129,9 @@ static int ccu_nkm_set_rate(struct clk_hw *hw, unsigned long rate,
unsigned long flags; unsigned long flags;
u32 reg; u32 reg;
_nkm.min_n = 1; _nkm.min_n = nkm->n.min;
_nkm.max_n = 1 << nkm->n.width; _nkm.max_n = 1 << nkm->n.width;
_nkm.min_k = 1; _nkm.min_k = nkm->k.min;
_nkm.max_k = 1 << nkm->k.width; _nkm.max_k = 1 << nkm->k.width;
_nkm.min_m = 1; _nkm.min_m = 1;
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width; _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;

4
drivers/clk/sunxi-ng/ccu_nkmp.c
View File

@ -107,9 +107,9 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw); struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
struct _ccu_nkmp _nkmp; struct _ccu_nkmp _nkmp;
_nkmp.min_n = 1; _nkmp.min_n = nkmp->n.min;
_nkmp.max_n = 1 << nkmp->n.width; _nkmp.max_n = 1 << nkmp->n.width;
_nkmp.min_k = 1; _nkmp.min_k = nkmp->k.min;
_nkmp.max_k = 1 << nkmp->k.width; _nkmp.max_k = 1 << nkmp->k.width;
_nkmp.min_m = 1; _nkmp.min_m = 1;
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width; _nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;

2
drivers/clk/sunxi-ng/ccu_nm.c
View File

@ -93,7 +93,7 @@ static long ccu_nm_round_rate(struct clk_hw *hw, unsigned long rate,
struct ccu_nm *nm = hw_to_ccu_nm(hw); struct ccu_nm *nm = hw_to_ccu_nm(hw);
struct _ccu_nm _nm; struct _ccu_nm _nm;
_nm.min_n = 1; _nm.min_n = nm->n.min;
_nm.max_n = 1 << nm->n.width; _nm.max_n = 1 << nm->n.width;
_nm.min_m = 1; _nm.min_m = 1;
_nm.max_m = nm->m.max ?: 1 << nm->m.width; _nm.max_m = nm->m.max ?: 1 << nm->m.width;