1 From 6e0d50daa97f4bf9706e343b4f71171e88921209 Mon Sep 17 00:00:00 2001
2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
3 Date: Thu, 29 Sep 2016 22:57:26 +0200
4 Subject: clk: sunxi-ng: Add minimums for all the relevant structures and
7 Modify the current clocks we have to be able to specify the minimum for
8 each clocks we support, just like we support the max.
10 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 Acked-by: Chen-Yu Tsai <wens@csie.org>
13 drivers/clk/sunxi-ng/ccu_mult.c | 7 ++++++-
14 drivers/clk/sunxi-ng/ccu_nk.c | 12 ++++++++----
15 drivers/clk/sunxi-ng/ccu_nkm.c | 18 ++++++++++++------
16 drivers/clk/sunxi-ng/ccu_nkmp.c | 24 ++++++++++++++++--------
17 drivers/clk/sunxi-ng/ccu_nm.c | 12 ++++++++----
18 5 files changed, 50 insertions(+), 23 deletions(-)
20 --- a/drivers/clk/sunxi-ng/ccu_mult.c
21 +++ b/drivers/clk/sunxi-ng/ccu_mult.c
26 - unsigned long mult, max;
27 + unsigned long mult, min, max;
30 static void ccu_mult_find_best(unsigned long parent, unsigned long rate,
31 @@ -23,6 +23,9 @@ static void ccu_mult_find_best(unsigned
34 _mult = rate / parent;
35 + if (_mult < mult->min)
38 if (_mult > mult->max)
41 @@ -37,6 +40,7 @@ static unsigned long ccu_mult_round_rate
42 struct ccu_mult *cm = data;
46 _cm.max = 1 << cm->mult.width;
47 ccu_mult_find_best(parent_rate, rate, &_cm);
49 @@ -101,6 +105,7 @@ static int ccu_mult_set_rate(struct clk_
50 ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
54 _cm.max = 1 << cm->mult.width;
55 ccu_mult_find_best(parent_rate, rate, &_cm);
57 --- a/drivers/clk/sunxi-ng/ccu_nk.c
58 +++ b/drivers/clk/sunxi-ng/ccu_nk.c
63 - unsigned long n, max_n;
64 - unsigned long k, max_k;
65 + unsigned long n, min_n, max_n;
66 + unsigned long k, min_k, max_k;
69 static void ccu_nk_find_best(unsigned long parent, unsigned long rate,
70 @@ -25,8 +25,8 @@ static void ccu_nk_find_best(unsigned lo
71 unsigned int best_k = 0, best_n = 0;
74 - for (_k = 1; _k <= nk->max_k; _k++) {
75 - for (_n = 1; _n <= nk->max_n; _n++) {
76 + for (_k = nk->min_k; _k <= nk->max_k; _k++) {
77 + for (_n = nk->min_n; _n <= nk->max_n; _n++) {
78 unsigned long tmp_rate = parent * _n * _k;
81 @@ -97,7 +97,9 @@ static long ccu_nk_round_rate(struct clk
82 if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
83 rate *= nk->fixed_post_div;
86 _nk.max_n = 1 << nk->n.width;
88 _nk.max_k = 1 << nk->k.width;
90 ccu_nk_find_best(*parent_rate, rate, &_nk);
91 @@ -120,7 +122,9 @@ static int ccu_nk_set_rate(struct clk_hw
92 if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
93 rate = rate * nk->fixed_post_div;
96 _nk.max_n = 1 << nk->n.width;
98 _nk.max_k = 1 << nk->k.width;
100 ccu_nk_find_best(parent_rate, rate, &_nk);
101 --- a/drivers/clk/sunxi-ng/ccu_nkm.c
102 +++ b/drivers/clk/sunxi-ng/ccu_nkm.c
107 - unsigned long n, max_n;
108 - unsigned long k, max_k;
109 - unsigned long m, max_m;
110 + unsigned long n, min_n, max_n;
111 + unsigned long k, min_k, max_k;
112 + unsigned long m, min_m, max_m;
115 static void ccu_nkm_find_best(unsigned long parent, unsigned long rate,
116 @@ -26,9 +26,9 @@ static void ccu_nkm_find_best(unsigned l
117 unsigned long best_n = 0, best_k = 0, best_m = 0;
118 unsigned long _n, _k, _m;
120 - for (_k = 1; _k <= nkm->max_k; _k++) {
121 - for (_n = 1; _n <= nkm->max_n; _n++) {
122 - for (_m = 1; _n <= nkm->max_m; _m++) {
123 + for (_k = nkm->min_k; _k <= nkm->max_k; _k++) {
124 + for (_n = nkm->min_n; _n <= nkm->max_n; _n++) {
125 + for (_m = nkm->min_m; _m <= nkm->max_m; _m++) {
126 unsigned long tmp_rate;
128 tmp_rate = parent * _n * _k / _m;
129 @@ -100,8 +100,11 @@ static unsigned long ccu_nkm_round_rate(
130 struct ccu_nkm *nkm = data;
131 struct _ccu_nkm _nkm;
134 _nkm.max_n = 1 << nkm->n.width;
136 _nkm.max_k = 1 << nkm->k.width;
138 _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
140 ccu_nkm_find_best(parent_rate, rate, &_nkm);
141 @@ -126,8 +129,11 @@ static int ccu_nkm_set_rate(struct clk_h
146 _nkm.max_n = 1 << nkm->n.width;
148 _nkm.max_k = 1 << nkm->k.width;
150 _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
152 ccu_nkm_find_best(parent_rate, rate, &_nkm);
153 --- a/drivers/clk/sunxi-ng/ccu_nkmp.c
154 +++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
156 #include "ccu_nkmp.h"
159 - unsigned long n, max_n;
160 - unsigned long k, max_k;
161 - unsigned long m, max_m;
162 - unsigned long p, max_p;
163 + unsigned long n, min_n, max_n;
164 + unsigned long k, min_k, max_k;
165 + unsigned long m, min_m, max_m;
166 + unsigned long p, min_p, max_p;
169 static void ccu_nkmp_find_best(unsigned long parent, unsigned long rate,
170 @@ -27,10 +27,10 @@ static void ccu_nkmp_find_best(unsigned
171 unsigned long best_n = 0, best_k = 0, best_m = 0, best_p = 0;
172 unsigned long _n, _k, _m, _p;
174 - for (_k = 1; _k <= nkmp->max_k; _k++) {
175 - for (_n = 1; _n <= nkmp->max_n; _n++) {
176 - for (_m = 1; _n <= nkmp->max_m; _m++) {
177 - for (_p = 1; _p <= nkmp->max_p; _p <<= 1) {
178 + for (_k = nkmp->min_k; _k <= nkmp->max_k; _k++) {
179 + for (_n = nkmp->min_n; _n <= nkmp->max_n; _n++) {
180 + for (_m = nkmp->min_m; _m <= nkmp->max_m; _m++) {
181 + for (_p = nkmp->min_p; _p <= nkmp->max_p; _p <<= 1) {
182 unsigned long tmp_rate;
184 tmp_rate = parent * _n * _k / (_m * _p);
185 @@ -107,9 +107,13 @@ static long ccu_nkmp_round_rate(struct c
186 struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
187 struct _ccu_nkmp _nkmp;
190 _nkmp.max_n = 1 << nkmp->n.width;
192 _nkmp.max_k = 1 << nkmp->k.width;
194 _nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
196 _nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
198 ccu_nkmp_find_best(*parent_rate, rate, &_nkmp);
199 @@ -125,9 +129,13 @@ static int ccu_nkmp_set_rate(struct clk_
204 _nkmp.max_n = 1 << nkmp->n.width;
206 _nkmp.max_k = 1 << nkmp->k.width;
208 _nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
210 _nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
212 ccu_nkmp_find_best(parent_rate, rate, &_nkmp);
213 --- a/drivers/clk/sunxi-ng/ccu_nm.c
214 +++ b/drivers/clk/sunxi-ng/ccu_nm.c
219 - unsigned long n, max_n;
220 - unsigned long m, max_m;
221 + unsigned long n, min_n, max_n;
222 + unsigned long m, min_m, max_m;
225 static void ccu_nm_find_best(unsigned long parent, unsigned long rate,
226 @@ -26,8 +26,8 @@ static void ccu_nm_find_best(unsigned lo
227 unsigned long best_n = 0, best_m = 0;
228 unsigned long _n, _m;
230 - for (_n = 1; _n <= nm->max_n; _n++) {
231 - for (_m = 1; _n <= nm->max_m; _m++) {
232 + for (_n = nm->min_n; _n <= nm->max_n; _n++) {
233 + for (_m = nm->min_m; _m <= nm->max_m; _m++) {
234 unsigned long tmp_rate = parent * _n / _m;
237 @@ -93,7 +93,9 @@ static long ccu_nm_round_rate(struct clk
238 struct ccu_nm *nm = hw_to_ccu_nm(hw);
242 _nm.max_n = 1 << nm->n.width;
244 _nm.max_m = nm->m.max ?: 1 << nm->m.width;
246 ccu_nm_find_best(*parent_rate, rate, &_nm);
247 @@ -114,7 +116,9 @@ static int ccu_nm_set_rate(struct clk_hw
249 ccu_frac_helper_disable(&nm->common, &nm->frac);
252 _nm.max_n = 1 << nm->n.width;
254 _nm.max_m = nm->m.max ?: 1 << nm->m.width;
256 ccu_nm_find_best(parent_rate, rate, &_nm);