From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 20 21:29:20 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2056E106566B;
	Wed, 20 Jun 2012 21:29:20 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A0E58FC1B;
	Wed, 20 Jun 2012 21:29:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5KLTJUn068839;
	Wed, 20 Jun 2012 21:29:19 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5KLTJE7068837;
	Wed, 20 Jun 2012 21:29:19 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <201206202129.q5KLTJE7068837@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Wed, 20 Jun 2012 21:29:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237341 - stable/8/sys/dev/wbwd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jun 2012 21:29:20 -0000

Author: rnoland
Date: Wed Jun 20 21:29:19 2012
New Revision: 237341
URL: http://svn.freebsd.org/changeset/base/237341

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/8/sys/dev/wbwd/wbwd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/dev/wbwd/wbwd.c
==============================================================================
--- stable/8/sys/dev/wbwd/wbwd.c	Wed Jun 20 21:28:17 2012	(r237340)
+++ stable/8/sys/dev/wbwd/wbwd.c	Wed Jun 20 21:29:19 2012	(r237341)
@@ -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);