From owner-svn-src-all@FreeBSD.ORG  Mon Jul 25 17:31:09 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EEBCC1065674;
	Mon, 25 Jul 2011 17:31:09 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE38D8FC21;
	Mon, 25 Jul 2011 17:31:09 +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 p6PHV9cp067637;
	Mon, 25 Jul 2011 17:31:09 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6PHV9me067633;
	Mon, 25 Jul 2011 17:31:09 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201107251731.p6PHV9me067633@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 25 Jul 2011 17:31:09 +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: r224346 - stable/8/sys/dev/mk48txx
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2011 17:31:10 -0000

Author: marius
Date: Mon Jul 25 17:31:09 2011
New Revision: 224346
URL: http://svn.freebsd.org/changeset/base/224346

Log:
  MFC: r221957
  
  Add support for MK48T37.

Modified:
  stable/8/sys/dev/mk48txx/mk48txx.c
  stable/8/sys/dev/mk48txx/mk48txxreg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (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/geom/label/   (props changed)

Modified: stable/8/sys/dev/mk48txx/mk48txx.c
==============================================================================
--- stable/8/sys/dev/mk48txx/mk48txx.c	Mon Jul 25 17:20:36 2011	(r224345)
+++ stable/8/sys/dev/mk48txx/mk48txx.c	Mon Jul 25 17:31:09 2011	(r224346)
@@ -33,7 +33,8 @@
 __FBSDID("$FreeBSD$");
 
 /*
- * Mostek MK48T02, MK48T08, MK48T18, MK48T59 time-of-day chip subroutines
+ * Mostek MK48T02, MK48T08, MK48T18, MK48T37 and MK48T59 time-of-day chip
+ * subroutines
  */
 
 #include <sys/param.h>
@@ -67,6 +68,7 @@ static const struct {
 	{ "mk48t02", MK48T02_CLKSZ, MK48T02_CLKOFF, 0 },
 	{ "mk48t08", MK48T08_CLKSZ, MK48T08_CLKOFF, 0 },
 	{ "mk48t18", MK48T18_CLKSZ, MK48T18_CLKOFF, 0 },
+	{ "mk48t37", MK48T37_CLKSZ, MK48T37_CLKOFF, MK48TXX_EXT_REGISTERS },
 	{ "mk48t59", MK48T59_CLKSZ, MK48T59_CLKOFF, MK48TXX_EXT_REGISTERS },
 };
 

Modified: stable/8/sys/dev/mk48txx/mk48txxreg.h
==============================================================================
--- stable/8/sys/dev/mk48txx/mk48txxreg.h	Mon Jul 25 17:20:36 2011	(r224345)
+++ stable/8/sys/dev/mk48txx/mk48txxreg.h	Mon Jul 25 17:31:09 2011	(r224346)
@@ -152,5 +152,8 @@
 #define	MK48T18_CLKSZ		8192
 #define	MK48T18_CLKOFF		0x1ff0
 
+#define	MK48T37_CLKSZ		32768
+#define	MK48T37_CLKOFF		0x1ff0
+
 #define	MK48T59_CLKSZ		8192
 #define	MK48T59_CLKOFF		0x1ff0