From owner-svn-src-all@FreeBSD.ORG  Mon Jul 25 17:32:22 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 D19A81065670;
	Mon, 25 Jul 2011 17:32:22 +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 C10278FC1A;
	Mon, 25 Jul 2011 17:32:22 +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 p6PHWMjK067777;
	Mon, 25 Jul 2011 17:32:22 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6PHWMi6067775;
	Mon, 25 Jul 2011 17:32:22 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201107251732.p6PHWMi6067775@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 25 Jul 2011 17:32:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224349 - stable/7/sys/sparc64/sparc64
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:32:22 -0000

Author: marius
Date: Mon Jul 25 17:32:22 2011
New Revision: 224349
URL: http://svn.freebsd.org/changeset/base/224349

Log:
  MFC: r221958
  
  Recognize the eeprom device found in Fujitsu PRIMEPOWER650 and 900.

Modified:
  stable/7/sys/sparc64/sparc64/eeprom.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/sparc64/eeprom.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/eeprom.c	Mon Jul 25 17:32:22 2011	(r224348)
+++ stable/7/sys/sparc64/sparc64/eeprom.c	Mon Jul 25 17:32:22 2011	(r224349)
@@ -107,8 +107,11 @@ DRIVER_MODULE(eeprom, sbus, eeprom_drive
 static int
 eeprom_probe(device_t dev)
 {
+	const char *name;
 
-	if (strcmp("eeprom", ofw_bus_get_name(dev)) == 0) {
+	name = ofw_bus_get_name(dev);
+	if (strcmp(name, "eeprom") == 0 ||
+	    strcmp(name, "FJSV,eeprom") == 0) {
 		device_set_desc(dev, "EEPROM/clock");
 		return (0);
 	}