Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/rockchip Set correct bits when enabling gpio ts...



details:   https://anonhg.NetBSD.org/src/rev/8b932ff4ebe3
branches:  trunk
changeset: 1000068:8b932ff4ebe3
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Jul 03 20:55:21 2019 +0000

description:
Set correct bits when enabling gpio tshut mode

diffstat:

 sys/arch/arm/rockchip/rk_tsadc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 96ee64bcb7f9 -r 8b932ff4ebe3 sys/arch/arm/rockchip/rk_tsadc.c
--- a/sys/arch/arm/rockchip/rk_tsadc.c  Wed Jul 03 20:47:22 2019 +0000
+++ b/sys/arch/arm/rockchip/rk_tsadc.c  Wed Jul 03 20:55:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rk_tsadc.c,v 1.6 2019/06/01 19:32:19 joerg Exp $       */
+/*     $NetBSD: rk_tsadc.c,v 1.7 2019/07/03 20:55:21 jmcneill Exp $    */
 
 /*
  * Copyright (c) 2019 Matthew R. Green
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.6 2019/06/01 19:32:19 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.7 2019/07/03 20:55:21 jmcneill Exp $");
 
 /*
  * Driver for the TSADC temperature sensor monitor in RK3328 and RK3399.
@@ -665,7 +665,7 @@
                KASSERT(mode == TSHUT_MODE_GPIO);
                val &= ~(TSADC_INT_EN_TSHUT_2CRU_EN_SRC1 |
                         TSADC_INT_EN_TSHUT_2CRU_EN_SRC0);
-               val &= TSADC_INT_EN_TSHUT_2GPIO_EN_SRC1 |
+               val |= TSADC_INT_EN_TSHUT_2GPIO_EN_SRC1 |
                       TSADC_INT_EN_TSHUT_2GPIO_EN_SRC0;
        }
        TSADC_WRITE(sc, TSADC_INT_EN, val);



Home | Main Index | Thread Index | Old Index