Module Name: src
Committed By: jmcneill
Date: Wed Jan 2 19:33:06 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_ccu_nkmp.c
Log Message:
Support SUNXI_CCU_NKMP_FACTOR_P_X4 flag
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/sunxi/sunxi_ccu_nkmp.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_nkmp.c
diff -u src/sys/arch/arm/sunxi/sunxi_ccu_nkmp.c:1.7 src/sys/arch/arm/sunxi/sunxi_ccu_nkmp.c:1.8
--- src/sys/arch/arm/sunxi/sunxi_ccu_nkmp.c:1.7 Fri Oct 6 21:09:21 2017
+++ src/sys/arch/arm/sunxi/sunxi_ccu_nkmp.c Wed Jan 2 19:33:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ccu_nkmp.c,v 1.7 2017/10/06 21:09:21 jmcneill Exp $ */
+/* $NetBSD: sunxi_ccu_nkmp.c,v 1.8 2019/01/02 19:33:06 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_ccu_nkmp.c,v 1.7 2017/10/06 21:09:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ccu_nkmp.c,v 1.8 2019/01/02 19:33:06 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -121,6 +121,8 @@ sunxi_ccu_nkmp_get_rate(struct sunxi_ccu
if ((nkmp->flags & SUNXI_CCU_NKMP_FACTOR_P_POW2) != 0)
p = 1 << p;
+ else if ((nkmp->flags & SUNXI_CCU_NKMP_FACTOR_P_X4) != 0)
+ p = p ? 4 : 1;
else
p++;
