From owner-svn-src-all@FreeBSD.ORG  Fri Dec 10 20:27:50 2010
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 7BF9B10656AC;
	Fri, 10 Dec 2010 20:27:50 +0000 (UTC)
	(envelope-from andreast@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B6198FC24;
	Fri, 10 Dec 2010 20:27:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBAKRowZ084683;
	Fri, 10 Dec 2010 20:27:50 GMT
	(envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBAKRodg084681;
	Fri, 10 Dec 2010 20:27:50 GMT
	(envelope-from andreast@svn.freebsd.org)
Message-Id: <201012102027.oBAKRodg084681@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Fri, 10 Dec 2010 20:27:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216360 - head/sys/dev/iicbus
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: Fri, 10 Dec 2010 20:27:50 -0000

Author: andreast
Date: Fri Dec 10 20:27:50 2010
New Revision: 216360
URL: http://svn.freebsd.org/changeset/base/216360

Log:
  On the Xserve G5 we find the LM75 instead of the DS1775. The core
  functionality is the same, a difference is that the DS1775 has a better
  precision than the LM75. But we do not use it in our setup. Make the
  LM75 work the same as the DS1775.
  
  Fix a typo in device_set_desc.
  
  Tested by: Paul Mather <paul at gromit dlib vt edu>
  
  Approved by:	nwhitehorn (mentor)

Modified:
  head/sys/dev/iicbus/ds1775.c

Modified: head/sys/dev/iicbus/ds1775.c
==============================================================================
--- head/sys/dev/iicbus/ds1775.c	Fri Dec 10 15:37:54 2010	(r216359)
+++ head/sys/dev/iicbus/ds1775.c	Fri Dec 10 20:27:50 2010	(r216360)
@@ -127,14 +127,15 @@ ds1775_probe(device_t dev)
 		return (ENXIO);
 
 	if (strcmp(name, "temp-monitor") != 0 ||
-	    strcmp(compatible, "ds1775") != 0)
+	    (strcmp(compatible, "ds1775") != 0 &&
+	     strcmp(compatible, "lm75") != 0))
 		return (ENXIO);
 
 	sc = device_get_softc(dev);
 	sc->sc_dev = dev;
 	sc->sc_addr = iicbus_get_addr(dev);
 
-	device_set_desc(dev, "Temp-Monitor DS1755");
+	device_set_desc(dev, "Temp-Monitor DS1775");
 
 	return (0);
 }