Skip to content

Commit 0c3c8e1

Browse files
mripardmripard
committed
clk: sunxi-ng: Implement multiplier maximum
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>
1 parent c9520be commit 0c3c8e1

File tree

6 files changed

+32
-20
lines changed

6 files changed

+32
-20
lines changed

‎drivers/clk/sunxi-ng/ccu_mult.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,
4141
struct _ccu_mult _cm;
4242

4343
_cm.min = cm->mult.min;
44-
_cm.max = 1 << cm->mult.width;
44+
45+
if (cm->mult.max)
46+
_cm.max = cm->mult.max;
47+
else
48+
_cm.max = (1 << cm->mult.width) + cm->mult.offset - 1;
49+
4550
ccu_mult_find_best(parent_rate, rate, &_cm);
4651

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

116121
_cm.min = cm->mult.min;
117-
_cm.max = 1 << cm->mult.width;
122+
123+
if (cm->mult.max)
124+
_cm.max = cm->mult.max;
125+
else
126+
_cm.max = (1 << cm->mult.width) + cm->mult.offset - 1;
127+
118128
ccu_mult_find_best(parent_rate, rate, &_cm);
119129

120130
spin_lock_irqsave(cm->common.lock, flags);

‎drivers/clk/sunxi-ng/ccu_mult.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,26 @@ struct ccu_mult_internal {
1010
u8 shift;
1111
u8 width;
1212
u8 min;
13+
u8 max;
1314
};
1415

15-
#define _SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, _offset, _min) \
16+
#define _SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, _offset, _min, _max) \
1617
{ \
1718
.min = _min, \
19+
.max = _max, \
1820
.offset = _offset, \
1921
.shift = _shift, \
2022
.width = _width, \
2123
}
2224

2325
#define _SUNXI_CCU_MULT_MIN(_shift, _width, _min) \
24-
_SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, 1, _min)
26+
_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, 1, _min, 0)
2527

2628
#define _SUNXI_CCU_MULT_OFFSET(_shift, _width, _offset) \
27-
_SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, _offset, 1)
29+
_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, _offset, 1, 0)
2830

2931
#define _SUNXI_CCU_MULT(_shift, _width) \
30-
_SUNXI_CCU_MULT_OFFSET_MIN(_shift, _width, 1, 1)
32+
_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, 1, 1, 0)
3133

3234
struct ccu_mult {
3335
u32 enable;

‎drivers/clk/sunxi-ng/ccu_nk.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ static long ccu_nk_round_rate(struct clk_hw *hw, unsigned long rate,
103103
rate *= nk->fixed_post_div;
104104

105105
_nk.min_n = nk->n.min;
106-
_nk.max_n = 1 << nk->n.width;
106+
_nk.max_n = nk->n.max ?: 1 << nk->n.width;
107107
_nk.min_k = nk->k.min;
108-
_nk.max_k = 1 << nk->k.width;
108+
_nk.max_k = nk->k.max ?: 1 << nk->k.width;
109109

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

130130
_nk.min_n = nk->n.min;
131-
_nk.max_n = 1 << nk->n.width;
131+
_nk.max_n = nk->n.max ?: 1 << nk->n.width;
132132
_nk.min_k = nk->k.min;
133-
_nk.max_k = 1 << nk->k.width;
133+
_nk.max_k = nk->k.max ?: 1 << nk->k.width;
134134

135135
ccu_nk_find_best(parent_rate, rate, &_nk);
136136

‎drivers/clk/sunxi-ng/ccu_nkm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,
110110
struct _ccu_nkm _nkm;
111111

112112
_nkm.min_n = nkm->n.min;
113-
_nkm.max_n = 1 << nkm->n.width;
113+
_nkm.max_n = nkm->n.max ?: 1 << nkm->n.width;
114114
_nkm.min_k = nkm->k.min;
115-
_nkm.max_k = 1 << nkm->k.width;
115+
_nkm.max_k = nkm->k.max ?: 1 << nkm->k.width;
116116
_nkm.min_m = 1;
117117
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
118118

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

141141
_nkm.min_n = nkm->n.min;
142-
_nkm.max_n = 1 << nkm->n.width;
142+
_nkm.max_n = nkm->n.max ?: 1 << nkm->n.width;
143143
_nkm.min_k = nkm->k.min;
144-
_nkm.max_k = 1 << nkm->k.width;
144+
_nkm.max_k = nkm->k.max ?: 1 << nkm->k.width;
145145
_nkm.min_m = 1;
146146
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
147147

‎drivers/clk/sunxi-ng/ccu_nkmp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
117117
struct _ccu_nkmp _nkmp;
118118

119119
_nkmp.min_n = nkmp->n.min;
120-
_nkmp.max_n = 1 << nkmp->n.width;
120+
_nkmp.max_n = nkmp->n.max ?: 1 << nkmp->n.width;
121121
_nkmp.min_k = nkmp->k.min;
122-
_nkmp.max_k = 1 << nkmp->k.width;
122+
_nkmp.max_k = nkmp->k.max ?: 1 << nkmp->k.width;
123123
_nkmp.min_m = 1;
124124
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
125125
_nkmp.min_p = 1;
@@ -139,9 +139,9 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
139139
u32 reg;
140140

141141
_nkmp.min_n = 1;
142-
_nkmp.max_n = 1 << nkmp->n.width;
142+
_nkmp.max_n = nkmp->n.max ?: 1 << nkmp->n.width;
143143
_nkmp.min_k = 1;
144-
_nkmp.max_k = 1 << nkmp->k.width;
144+
_nkmp.max_k = nkmp->k.max ?: 1 << nkmp->k.width;
145145
_nkmp.min_m = 1;
146146
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
147147
_nkmp.min_p = 1;

‎drivers/clk/sunxi-ng/ccu_nm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static long ccu_nm_round_rate(struct clk_hw *hw, unsigned long rate,
100100
struct _ccu_nm _nm;
101101

102102
_nm.min_n = nm->n.min;
103-
_nm.max_n = 1 << nm->n.width;
103+
_nm.max_n = nm->n.max ?: 1 << nm->n.width;
104104
_nm.min_m = 1;
105105
_nm.max_m = nm->m.max ?: 1 << nm->m.width;
106106

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

125125
_nm.min_n = 1;
126-
_nm.max_n = 1 << nm->n.width;
126+
_nm.max_n = nm->n.max ?: 1 << nm->n.width;
127127
_nm.min_m = 1;
128128
_nm.max_m = nm->m.max ?: 1 << nm->m.width;
129129

0 commit comments

Comments
 (0)