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

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Sat Dec  5 18:29:22 UTC 2015

Modified Files:
        src/sys/arch/arm/samsung: exynos5422_clock.c

Log Message:
fix div clk set/get


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos5422_clock.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/samsung/exynos5422_clock.c
diff -u src/sys/arch/arm/samsung/exynos5422_clock.c:1.1 src/sys/arch/arm/samsung/exynos5422_clock.c:1.2
--- src/sys/arch/arm/samsung/exynos5422_clock.c:1.1	Sat Dec  5 13:32:27 2015
+++ src/sys/arch/arm/samsung/exynos5422_clock.c	Sat Dec  5 18:29:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos5422_clock.c,v 1.1 2015/12/05 13:32:27 jmcneill Exp $ */
+/* $NetBSD: exynos5422_clock.c,v 1.2 2015/12/05 18:29:22 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.1 2015/12/05 13:32:27 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.2 2015/12/05 18:29:22 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -402,7 +402,7 @@ static u_int
 exynos5422_clock_get_rate_div(struct exynos5422_clock_softc *sc,
     struct exynos_clk *eclk)
 {
-	struct exynos_mux_clk *emux = &eclk->u.mux;
+	struct exynos_div_clk *ediv = &eclk->u.div;
 	struct clk *clk_parent;
 
 	KASSERT(eclk->type == EXYNOS_CLK_DIV);
@@ -410,8 +410,8 @@ exynos5422_clock_get_rate_div(struct exy
 	clk_parent = exynos5422_clock_get_parent(sc, &eclk->base);
 	const u_int parent_rate = exynos5422_clock_get_rate(sc, clk_parent);
 
-	const uint32_t v = CLOCK_READ(sc, emux->reg);
-	const u_int div = __SHIFTOUT(v, emux->bits);
+	const uint32_t v = CLOCK_READ(sc, ediv->reg);
+	const u_int div = __SHIFTOUT(v, ediv->bits);
 
 	return parent_rate / (div + 1);
 }
@@ -420,7 +420,7 @@ static int
 exynos5422_clock_set_rate_div(struct exynos5422_clock_softc *sc,
     struct exynos_clk *eclk, u_int rate)
 {
-	struct exynos_mux_clk *emux = &eclk->u.mux;
+	struct exynos_div_clk *ediv = &eclk->u.div;
 	struct clk *clk_parent;
 	int tmp_div, new_div = -1;
 	u_int tmp_rate;
@@ -430,7 +430,7 @@ exynos5422_clock_set_rate_div(struct exy
 	clk_parent = exynos5422_clock_get_parent(sc, &eclk->base);
 	const u_int parent_rate = exynos5422_clock_get_rate(sc, clk_parent);
 
-	for (tmp_div = 0; tmp_div < popcount32(emux->bits); tmp_div++) {
+	for (tmp_div = 0; tmp_div < popcount32(ediv->bits); tmp_div++) {
 		tmp_rate = parent_rate / (tmp_div + 1);
 		if (tmp_rate <= rate) {
 			new_div = tmp_div;
@@ -440,10 +440,10 @@ exynos5422_clock_set_rate_div(struct exy
 	if (new_div == -1)
 		return EINVAL;
 
-	uint32_t v = CLOCK_READ(sc, emux->reg);
-	v &= ~emux->bits;
-	v |= __SHIFTIN(new_div, emux->bits);
-	CLOCK_WRITE(sc, emux->reg, v);
+	uint32_t v = CLOCK_READ(sc, ediv->reg);
+	v &= ~ediv->bits;
+	v |= __SHIFTIN(new_div, ediv->bits);
+	CLOCK_WRITE(sc, ediv->reg, v);
 
 	return 0;
 }
@@ -522,6 +522,8 @@ exynos5422_clock_set_rate(void *priv, st
 {
 	struct exynos_clk *eclk = (struct exynos_clk *)clk;
 
+	KASSERT((clk->flags & CLK_SET_RATE_PARENT) == 0);
+
 	switch (eclk->type) {
 	case EXYNOS_CLK_FIXED:
 		return EIO;