Module Name: src Committed By: knakahara Date: Wed Dec 13 00:27:01 UTC 2017
Modified Files: src/sys/dev/isa: wbsio.c Log Message: Fix NCT6779 gpio pin configuration. Implemeted by s-yamaguchi@IIJ, reviewed by msaitoh@n.o. I just commit by proxy. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/isa/wbsio.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/dev/isa/wbsio.c diff -u src/sys/dev/isa/wbsio.c:1.16 src/sys/dev/isa/wbsio.c:1.17 --- src/sys/dev/isa/wbsio.c:1.16 Wed Dec 13 00:26:06 2017 +++ src/sys/dev/isa/wbsio.c Wed Dec 13 00:27:01 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: wbsio.c,v 1.16 2017/12/13 00:26:06 knakahara Exp $ */ +/* $NetBSD: wbsio.c,v 1.17 2017/12/13 00:27:01 knakahara Exp $ */ /* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kette...@openbsd.org> @@ -668,7 +668,7 @@ wbsio_gpio_pinconfig_nct6779d(device_t p mfs2 |= WBSIO_NCT6779D_MFS2_GP04; mfs2 |= WBSIO_NCT6779D_MFS2_GP05; mfs2 |= WBSIO_NCT6779D_MFS2_GP06; - mfs3 |= WBSIO_NCT6779D_MFS3_GP07_MASK; + mfs3 &= ~WBSIO_NCT6779D_MFS3_GP07_MASK; /* GPIO1 pin configs */ mfs4 |= WBSIO_NCT6779D_MFS4_GP10_GP17; @@ -703,7 +703,7 @@ wbsio_gpio_pinconfig_nct6779d(device_t p mfs1 |= WBSIO_NCT6779D_MFS1_GP42; mfs1 |= WBSIO_NCT6779D_MFS1_GP42; gopt2 |= WBSIO_NCT6779D_GOPT2_GP43; - mfs1 |= WBSIO_NCT6779D_MFS1_GP44_GP45_MASK; + mfs1 &= ~WBSIO_NCT6779D_MFS1_GP44_GP45_MASK; gopt2 &= ~WBSIO_NCT6779D_GOPT2_GP46_MASK; mfs1 |= WBSIO_NCT6779D_MFS1_GP47;