From owner-svn-src-all@FreeBSD.ORG  Tue Nov 12 16:08:24 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3C5148FC;
 Tue, 12 Nov 2013 16:08:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C3B527DD;
 Tue, 12 Nov 2013 16:08:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACG8OV7004231;
 Tue, 12 Nov 2013 16:08:24 GMT (envelope-from loos@svn.freebsd.org)
Received: (from loos@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACG8O3C004230;
 Tue, 12 Nov 2013 16:08:24 GMT (envelope-from loos@svn.freebsd.org)
Message-Id: <201311121608.rACG8O3C004230@svn.freebsd.org>
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Tue, 12 Nov 2013 16:08:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258050 - head/sys/dev/gpio
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
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/options/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: Tue, 12 Nov 2013 16:08:24 -0000

Author: loos
Date: Tue Nov 12 16:08:23 2013
New Revision: 258050
URL: http://svnweb.freebsd.org/changeset/base/258050

Log:
  Fix gpiobus to return BUS_PROBE_GENERIC insted of BUS_PROBE_SPECIFIC (0) so
  it can be overriden by its OFW/FDT version.
  
  Give a chance for GPIO devices that implement the device_identify method to
  attach.
  
  Approved by:	adrian (mentor)

Modified:
  head/sys/dev/gpio/gpiobus.c

Modified: head/sys/dev/gpio/gpiobus.c
==============================================================================
--- head/sys/dev/gpio/gpiobus.c	Tue Nov 12 15:09:28 2013	(r258049)
+++ head/sys/dev/gpio/gpiobus.c	Tue Nov 12 16:08:23 2013	(r258050)
@@ -175,7 +175,8 @@ static int
 gpiobus_probe(device_t dev)
 {
 	device_set_desc(dev, "GPIO bus");
-	return (0);
+
+	return (BUS_PROBE_GENERIC);
 }
 
 static int
@@ -209,7 +210,9 @@ gpiobus_attach(device_t dev)
 	/*
 	 * Get parent's pins and mark them as unmapped
 	 */
+	bus_generic_probe(dev);
 	bus_enumerate_hinted_children(dev);
+
 	return (bus_generic_attach(dev));
 }