Author: rnoland
Date: Wed Jun 20 21:34:03 2012
New Revision: 237343
URL: http://svn.freebsd.org/changeset/base/237343
Log:
MFC r236246
Add device ids for the Winbond 83627DHG-P chip and set the registers to
trigger the keyboard reset line on timeout.
Modified:
stable/9/sys/dev/wbwd/wbwd.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/dev/wbwd/wbwd.c
==============================================================================
--- stable/9/sys/dev/wbwd/wbwd.c Wed Jun 20 21:32:54 2012
(r237342)
+++ stable/9/sys/dev/wbwd/wbwd.c Wed Jun 20 21:34:03 2012
(r237343)
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
#define WB_LDN8_CRF5 0xF5
#define WB_LDN8_CRF5_SCALE 0x08 /* 0: 1s, 1: 60s */
#define WB_LDN8_CRF5_KEYB_P20 0x04 /* 1: keyb P20 forces timeout */
+#define WB_LDN8_CRF5_KBRST 0x02 /* 1: timeout causes pin60 kbd
reset */
/* CRF6: Watchdog Timeout (0 == off). Mapped to reg_timeout. */
#define WB_LDN8_CRF6 0xF6
@@ -180,6 +181,12 @@ struct winbond_vendor_device_id {
.device_rev = 0x25,
.descr = "Winbond 83627DHG IC ver. 5",
},
+ {
+ .vendor_id = 0x5ca3,
+ .device_id = 0xb0,
+ .device_rev = 0x73,
+ .descr = "Winbond 83627DHG-P",
+ },
};
/*
@@ -637,6 +644,7 @@ wb_attach(device_t dev)
* Disable all all interrupt reset sources (defaults).
*/
sc->reg_1 &= ~(WB_LDN8_CRF5_KEYB_P20);
+ sc->reg_1 |= WB_LDN8_CRF5_KBRST;
write_efir_1(sc, WB_LDN8_CRF5);
write_efdr_1(sc, sc->reg_1);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
