svn commit: r363887 - head/sys/arm/allwinner/clkng

Emmanuel Vadot manu at FreeBSD.org
Wed Aug 5 08:31:27 UTC 2020


Author: manu
Date: Wed Aug  5 08:31:26 2020
New Revision: 363887
URL: https://svnweb.freebsd.org/changeset/base/363887

Log:
  allwinner: clk: Fix nm clock calculation
  
  Use the right factor when finding the best frequency and compare the
  absolute value of the result.
  
  Submitted by:	kibab
  MFC after:	3 days

Modified:
  head/sys/arm/allwinner/clkng/aw_clk_nm.c

Modified: head/sys/arm/allwinner/clkng/aw_clk_nm.c
==============================================================================
--- head/sys/arm/allwinner/clkng/aw_clk_nm.c	Wed Aug  5 07:34:45 2020	(r363886)
+++ head/sys/arm/allwinner/clkng/aw_clk_nm.c	Wed Aug  5 08:31:26 2020	(r363887)
@@ -151,7 +151,7 @@ aw_clk_nm_find_best(struct aw_clk_nm_sc *sc, uint64_t 
 	min_n = aw_clk_factor_get_min(&sc->n);
 
 	for (m = min_m; m <= max_m; ) {
-		for (n = min_m; n <= max_n; ) {
+		for (n = min_n; n <= max_n; ) {
 			cur = fparent / n / m;
 			if (abs(*fout - cur) < abs(*fout - best)) {
 				best = cur;
@@ -196,7 +196,7 @@ aw_clk_nm_set_freq(struct clknode *clk, uint64_t fpare
 			clknode_get_freq(p_clk, &fparent);
 
 			cur = aw_clk_nm_find_best(sc, fparent, fout, &n, &m);
-			if ((*fout - cur) < (*fout - best)) {
+			if (abs((*fout - cur)) < abs((*fout - best))) {
 				best = cur;
 				best_parent = p_idx;
 				best_n = n;


More information about the svn-src-all mailing list