Module Name: src
Committed By: jmcneill
Date: Sun Jun 17 14:48:15 UTC 2018
Modified Files:
src/sys/arch/arm/rockchip: rk_cru_composite.c rk_cru_gate.c
Log Message:
Make gate enable/disable logic easier to read. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk_cru_composite.c \
src/sys/arch/arm/rockchip/rk_cru_gate.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/rockchip/rk_cru_composite.c
diff -u src/sys/arch/arm/rockchip/rk_cru_composite.c:1.1 src/sys/arch/arm/rockchip/rk_cru_composite.c:1.2
--- src/sys/arch/arm/rockchip/rk_cru_composite.c:1.1 Sat Jun 16 00:19:04 2018
+++ src/sys/arch/arm/rockchip/rk_cru_composite.c Sun Jun 17 14:48:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_cru_composite.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $ */
+/* $NetBSD: rk_cru_composite.c,v 1.2 2018/06/17 14:48:15 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_cru_composite.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_cru_composite.c,v 1.2 2018/06/17 14:48:15 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -48,7 +48,7 @@ rk_cru_composite_enable(struct rk_cru_so
return enable ? 0 : ENXIO;
const uint32_t write_mask = composite->gate_mask << 16;
- const uint32_t write_val = __SHIFTIN(!enable, composite->gate_mask);
+ const uint32_t write_val = enable ? 0 : composite->gate_mask;
CRU_WRITE(sc, composite->gate_reg, write_mask | write_val);
Index: src/sys/arch/arm/rockchip/rk_cru_gate.c
diff -u src/sys/arch/arm/rockchip/rk_cru_gate.c:1.1 src/sys/arch/arm/rockchip/rk_cru_gate.c:1.2
--- src/sys/arch/arm/rockchip/rk_cru_gate.c:1.1 Sat Jun 16 00:19:04 2018
+++ src/sys/arch/arm/rockchip/rk_cru_gate.c Sun Jun 17 14:48:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_cru_gate.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $ */
+/* $NetBSD: rk_cru_gate.c,v 1.2 2018/06/17 14:48:15 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_cru_gate.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_cru_gate.c,v 1.2 2018/06/17 14:48:15 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -45,7 +45,7 @@ rk_cru_gate_enable(struct rk_cru_softc *
KASSERT(clk->type == RK_CRU_GATE);
const uint32_t write_mask = gate->mask << 16;
- const uint32_t write_val = __SHIFTIN(!enable, gate->mask);
+ const uint32_t write_val = enable ? 0 : gate->mask;
CRU_WRITE(sc, gate->reg, write_mask | write_val);
