From owner-svn-src-head@FreeBSD.ORG  Sun Jun 26 00:35:12 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 019371065672;
	Sun, 26 Jun 2011 00:35:12 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E5E9A8FC08;
	Sun, 26 Jun 2011 00:35:11 +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 p5Q0ZBGE029071;
	Sun, 26 Jun 2011 00:35:11 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5Q0ZBiM029069;
	Sun, 26 Jun 2011 00:35:11 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201106260035.p5Q0ZBiM029069@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 26 Jun 2011 00:35:11 +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: r223554 - head/sys/dev/sound/macio
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jun 2011 00:35:12 -0000

Author: nwhitehorn
Date: Sun Jun 26 00:35:11 2011
New Revision: 223554
URL: http://svn.freebsd.org/changeset/base/223554

Log:
  Do not attach to the sound device on G5 Xserves, which is actually an
  LED controller used to run the load graph on the server's front panel.
  
  Reported by:	Paul Mather <paul at gromit dot dlib dot vt dot edu>
  MFC after:	3 days

Modified:
  head/sys/dev/sound/macio/i2s.c

Modified: head/sys/dev/sound/macio/i2s.c
==============================================================================
--- head/sys/dev/sound/macio/i2s.c	Sat Jun 25 23:14:49 2011	(r223553)
+++ head/sys/dev/sound/macio/i2s.c	Sun Jun 26 00:35:11 2011	(r223554)
@@ -158,6 +158,8 @@ static int
 i2s_probe(device_t self)
 {
 	const char 		*name;
+	phandle_t		subchild;
+	char			subchildname[255];
 
 	name = ofw_bus_get_name(self);
 	if (!name)
@@ -165,6 +167,16 @@ i2s_probe(device_t self)
 
 	if (strcmp(name, "i2s") != 0)
 		return (ENXIO);
+
+	/*
+	 * Do not attach to "lightshow" I2S devices on Xserves. This controller
+	 * is used there to control the LEDs on the front panel, and this
+	 * driver can't handle it.
+	 */
+	subchild = OF_child(OF_child(ofw_bus_get_node(self)));
+	if (subchild != 0 && OF_getprop(subchild, "name", subchildname,
+	    sizeof(subchildname)) > 0 && strcmp(subchildname, "lightshow") == 0)
+		return (ENXIO);
 	
 	device_set_desc(self, "Apple I2S Audio Controller");