CVS commit: src/sys/arch/arm/sunxi

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Mon Mar 19 16:19:17 UTC 2018

Modified Files:
        src/sys/arch/arm/sunxi: sunxi_ccu_div.c

Log Message:
Make sunxi_ccu_div_set_rate() work on non-SUNXI_CCU_DIV_TIMES_TWO
clocks.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_ccu_div.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/sunxi/sunxi_ccu_div.c
diff -u src/sys/arch/arm/sunxi/sunxi_ccu_div.c:1.4 src/sys/arch/arm/sunxi/sunxi_ccu_div.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_ccu_div.c:1.4	Mon Oct  9 14:01:59 2017
+++ src/sys/arch/arm/sunxi/sunxi_ccu_div.c	Mon Mar 19 16:19:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ccu_div.c,v 1.4 2017/10/09 14:01:59 jmcneill Exp $ */
+/* $NetBSD: sunxi_ccu_div.c,v 1.5 2018/03/19 16:19:17 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_ccu_div.c,v 1.4 2017/10/09 14:01:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ccu_div.c,v 1.5 2018/03/19 16:19:17 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -104,6 +104,7 @@ sunxi_ccu_div_set_rate(struct sunxi_ccu_
 {
 	struct sunxi_ccu_div *div = &clk->u.div;
 	struct clk *clkp, *clkp_parent;
+	int parent_rate;
 	uint32_t val, raw_div;
 	int ratio;
 
@@ -123,16 +124,22 @@ sunxi_ccu_div_set_rate(struct sunxi_ccu_
 
 	val = CCU_READ(sc, div->reg);
 
+	parent_rate = clk_get_rate(clkp_parent);
+	if (parent_rate == 0)
+		return (new_rate == 0) ? 0 : ERANGE;
+
+	ratio = howmany(parent_rate, new_rate);
 	if ((div->flags & SUNXI_CCU_DIV_TIMES_TWO) != 0) {
-		ratio = howmany(clk_get_rate(clkp_parent), new_rate);
 		if (ratio > 1 && (ratio & 1) != 0)
 			ratio++;
 		raw_div = ratio >> 1;
-		if (raw_div > __SHIFTOUT_MASK(div->div))
-			return ERANGE;
-	} else {
+	} else if ((div->flags & SUNXI_CCU_DIV_POWER_OF_TWO) != 0) {
 		return EINVAL;
+	} else {
+		raw_div = (ratio > 0 ) ? ratio - 1 : 0;
 	}
+	if (raw_div > __SHIFTOUT_MASK(div->div))
+		return ERANGE;
 
 	val &= ~div->div;
 	val |= __SHIFTIN(raw_div, div->div);