summaryrefslogtreecommitdiff
path: root/target/linux/sunxi/patches-4.9/0005-clk-sunxi-ng-Add-minimums-for-all-the-relevant-struc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/sunxi/patches-4.9/0005-clk-sunxi-ng-Add-minimums-for-all-the-relevant-struc.patch')
-rw-r--r--target/linux/sunxi/patches-4.9/0005-clk-sunxi-ng-Add-minimums-for-all-the-relevant-struc.patch256
1 files changed, 256 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-4.9/0005-clk-sunxi-ng-Add-minimums-for-all-the-relevant-struc.patch b/target/linux/sunxi/patches-4.9/0005-clk-sunxi-ng-Add-minimums-for-all-the-relevant-struc.patch
new file mode 100644
index 0000000..0165ade
--- /dev/null
+++ b/target/linux/sunxi/patches-4.9/0005-clk-sunxi-ng-Add-minimums-for-all-the-relevant-struc.patch
@@ -0,0 +1,256 @@
+From 6e0d50daa97f4bf9706e343b4f71171e88921209 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 29 Sep 2016 22:57:26 +0200
+Subject: clk: sunxi-ng: Add minimums for all the relevant structures and
+ clocks
+
+Modify the current clocks we have to be able to specify the minimum for
+each clocks we support, just like we support the max.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Chen-Yu Tsai <wens@csie.org>
+---
+ drivers/clk/sunxi-ng/ccu_mult.c | 7 ++++++-
+ drivers/clk/sunxi-ng/ccu_nk.c | 12 ++++++++----
+ drivers/clk/sunxi-ng/ccu_nkm.c | 18 ++++++++++++------
+ drivers/clk/sunxi-ng/ccu_nkmp.c | 24 ++++++++++++++++--------
+ drivers/clk/sunxi-ng/ccu_nm.c | 12 ++++++++----
+ 5 files changed, 50 insertions(+), 23 deletions(-)
+
+--- a/drivers/clk/sunxi-ng/ccu_mult.c
++++ b/drivers/clk/sunxi-ng/ccu_mult.c
+@@ -14,7 +14,7 @@
+ #include "ccu_mult.h"
+
+ struct _ccu_mult {
+- unsigned long mult, max;
++ unsigned long mult, min, max;
+ };
+
+ static void ccu_mult_find_best(unsigned long parent, unsigned long rate,
+@@ -23,6 +23,9 @@ static void ccu_mult_find_best(unsigned
+ int _mult;
+
+ _mult = rate / parent;
++ if (_mult < mult->min)
++ _mult = mult->min;
++
+ if (_mult > mult->max)
+ _mult = mult->max;
+
+@@ -37,6 +40,7 @@ static unsigned long ccu_mult_round_rate
+ struct ccu_mult *cm = data;
+ struct _ccu_mult _cm;
+
++ _cm.min = 1;
+ _cm.max = 1 << cm->mult.width;
+ ccu_mult_find_best(parent_rate, rate, &_cm);
+
+@@ -101,6 +105,7 @@ static int ccu_mult_set_rate(struct clk_
+ ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
+ &parent_rate);
+
++ _cm.min = 1;
+ _cm.max = 1 << cm->mult.width;
+ ccu_mult_find_best(parent_rate, rate, &_cm);
+
+--- a/drivers/clk/sunxi-ng/ccu_nk.c
++++ b/drivers/clk/sunxi-ng/ccu_nk.c
+@@ -14,8 +14,8 @@
+ #include "ccu_nk.h"
+
+ struct _ccu_nk {
+- unsigned long n, max_n;
+- unsigned long k, max_k;
++ unsigned long n, min_n, max_n;
++ unsigned long k, min_k, max_k;
+ };
+
+ static void ccu_nk_find_best(unsigned long parent, unsigned long rate,
+@@ -25,8 +25,8 @@ static void ccu_nk_find_best(unsigned lo
+ unsigned int best_k = 0, best_n = 0;
+ unsigned int _k, _n;
+
+- for (_k = 1; _k <= nk->max_k; _k++) {
+- for (_n = 1; _n <= nk->max_n; _n++) {
++ for (_k = nk->min_k; _k <= nk->max_k; _k++) {
++ for (_n = nk->min_n; _n <= nk->max_n; _n++) {
+ unsigned long tmp_rate = parent * _n * _k;
+
+ if (tmp_rate > rate)
+@@ -97,7 +97,9 @@ static long ccu_nk_round_rate(struct clk
+ if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
+ rate *= nk->fixed_post_div;
+
++ _nk.min_n = 1;
+ _nk.max_n = 1 << nk->n.width;
++ _nk.min_k = 1;
+ _nk.max_k = 1 << nk->k.width;
+
+ ccu_nk_find_best(*parent_rate, rate, &_nk);
+@@ -120,7 +122,9 @@ static int ccu_nk_set_rate(struct clk_hw
+ if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
+ rate = rate * nk->fixed_post_div;
+
++ _nk.min_n = 1;
+ _nk.max_n = 1 << nk->n.width;
++ _nk.min_k = 1;
+ _nk.max_k = 1 << nk->k.width;
+
+ ccu_nk_find_best(parent_rate, rate, &_nk);
+--- a/drivers/clk/sunxi-ng/ccu_nkm.c
++++ b/drivers/clk/sunxi-ng/ccu_nkm.c
+@@ -14,9 +14,9 @@
+ #include "ccu_nkm.h"
+
+ struct _ccu_nkm {
+- unsigned long n, max_n;
+- unsigned long k, max_k;
+- unsigned long m, max_m;
++ unsigned long n, min_n, max_n;
++ unsigned long k, min_k, max_k;
++ unsigned long m, min_m, max_m;
+ };
+
+ static void ccu_nkm_find_best(unsigned long parent, unsigned long rate,
+@@ -26,9 +26,9 @@ static void ccu_nkm_find_best(unsigned l
+ unsigned long best_n = 0, best_k = 0, best_m = 0;
+ unsigned long _n, _k, _m;
+
+- for (_k = 1; _k <= nkm->max_k; _k++) {
+- for (_n = 1; _n <= nkm->max_n; _n++) {
+- for (_m = 1; _n <= nkm->max_m; _m++) {
++ for (_k = nkm->min_k; _k <= nkm->max_k; _k++) {
++ for (_n = nkm->min_n; _n <= nkm->max_n; _n++) {
++ for (_m = nkm->min_m; _m <= nkm->max_m; _m++) {
+ unsigned long tmp_rate;
+
+ tmp_rate = parent * _n * _k / _m;
+@@ -100,8 +100,11 @@ static unsigned long ccu_nkm_round_rate(
+ struct ccu_nkm *nkm = data;
+ struct _ccu_nkm _nkm;
+
++ _nkm.min_n = 1;
+ _nkm.max_n = 1 << nkm->n.width;
++ _nkm.min_k = 1;
+ _nkm.max_k = 1 << nkm->k.width;
++ _nkm.min_m = 1;
+ _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
+
+ ccu_nkm_find_best(parent_rate, rate, &_nkm);
+@@ -126,8 +129,11 @@ static int ccu_nkm_set_rate(struct clk_h
+ unsigned long flags;
+ u32 reg;
+
++ _nkm.min_n = 1;
+ _nkm.max_n = 1 << nkm->n.width;
++ _nkm.min_k = 1;
+ _nkm.max_k = 1 << nkm->k.width;
++ _nkm.min_m = 1;
+ _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
+
+ ccu_nkm_find_best(parent_rate, rate, &_nkm);
+--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
++++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
+@@ -14,10 +14,10 @@
+ #include "ccu_nkmp.h"
+
+ struct _ccu_nkmp {
+- unsigned long n, max_n;
+- unsigned long k, max_k;
+- unsigned long m, max_m;
+- unsigned long p, max_p;
++ unsigned long n, min_n, max_n;
++ unsigned long k, min_k, max_k;
++ unsigned long m, min_m, max_m;
++ unsigned long p, min_p, max_p;
+ };
+
+ static void ccu_nkmp_find_best(unsigned long parent, unsigned long rate,
+@@ -27,10 +27,10 @@ static void ccu_nkmp_find_best(unsigned
+ unsigned long best_n = 0, best_k = 0, best_m = 0, best_p = 0;
+ unsigned long _n, _k, _m, _p;
+
+- for (_k = 1; _k <= nkmp->max_k; _k++) {
+- for (_n = 1; _n <= nkmp->max_n; _n++) {
+- for (_m = 1; _n <= nkmp->max_m; _m++) {
+- for (_p = 1; _p <= nkmp->max_p; _p <<= 1) {
++ for (_k = nkmp->min_k; _k <= nkmp->max_k; _k++) {
++ for (_n = nkmp->min_n; _n <= nkmp->max_n; _n++) {
++ for (_m = nkmp->min_m; _m <= nkmp->max_m; _m++) {
++ for (_p = nkmp->min_p; _p <= nkmp->max_p; _p <<= 1) {
+ unsigned long tmp_rate;
+
+ tmp_rate = parent * _n * _k / (_m * _p);
+@@ -107,9 +107,13 @@ static long ccu_nkmp_round_rate(struct c
+ struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
+ struct _ccu_nkmp _nkmp;
+
++ _nkmp.min_n = 1;
+ _nkmp.max_n = 1 << nkmp->n.width;
++ _nkmp.min_k = 1;
+ _nkmp.max_k = 1 << nkmp->k.width;
++ _nkmp.min_m = 1;
+ _nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
++ _nkmp.min_p = 1;
+ _nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
+
+ ccu_nkmp_find_best(*parent_rate, rate, &_nkmp);
+@@ -125,9 +129,13 @@ static int ccu_nkmp_set_rate(struct clk_
+ unsigned long flags;
+ u32 reg;
+
++ _nkmp.min_n = 1;
+ _nkmp.max_n = 1 << nkmp->n.width;
++ _nkmp.min_k = 1;
+ _nkmp.max_k = 1 << nkmp->k.width;
++ _nkmp.min_m = 1;
+ _nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
++ _nkmp.min_p = 1;
+ _nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
+
+ ccu_nkmp_find_best(parent_rate, rate, &_nkmp);
+--- a/drivers/clk/sunxi-ng/ccu_nm.c
++++ b/drivers/clk/sunxi-ng/ccu_nm.c
+@@ -15,8 +15,8 @@
+ #include "ccu_nm.h"
+
+ struct _ccu_nm {
+- unsigned long n, max_n;
+- unsigned long m, max_m;
++ unsigned long n, min_n, max_n;
++ unsigned long m, min_m, max_m;
+ };
+
+ static void ccu_nm_find_best(unsigned long parent, unsigned long rate,
+@@ -26,8 +26,8 @@ static void ccu_nm_find_best(unsigned lo
+ unsigned long best_n = 0, best_m = 0;
+ unsigned long _n, _m;
+
+- for (_n = 1; _n <= nm->max_n; _n++) {
+- for (_m = 1; _n <= nm->max_m; _m++) {
++ for (_n = nm->min_n; _n <= nm->max_n; _n++) {
++ for (_m = nm->min_m; _m <= nm->max_m; _m++) {
+ unsigned long tmp_rate = parent * _n / _m;
+
+ if (tmp_rate > rate)
+@@ -93,7 +93,9 @@ static long ccu_nm_round_rate(struct clk
+ struct ccu_nm *nm = hw_to_ccu_nm(hw);
+ struct _ccu_nm _nm;
+
++ _nm.min_n = 1;
+ _nm.max_n = 1 << nm->n.width;
++ _nm.min_m = 1;
+ _nm.max_m = nm->m.max ?: 1 << nm->m.width;
+
+ ccu_nm_find_best(*parent_rate, rate, &_nm);
+@@ -114,7 +116,9 @@ static int ccu_nm_set_rate(struct clk_hw
+ else
+ ccu_frac_helper_disable(&nm->common, &nm->frac);
+
++ _nm.min_n = 1;
+ _nm.max_n = 1 << nm->n.width;
++ _nm.min_m = 1;
+ _nm.max_m = nm->m.max ?: 1 << nm->m.width;
+
+ ccu_nm_find_best(parent_rate, rate, &_nm);
generated by cgit v1.1 at 2024-07-24 02:24:42 +0000