From owner-svn-src-all@freebsd.org  Sun May 15 14:47:52 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01942B397FA;
 Sun, 15 May 2016 14:47:52 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C756C1D17;
 Sun, 15 May 2016 14:47:51 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FElpcr066463;
 Sun, 15 May 2016 14:47:51 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FElpqr066462;
 Sun, 15 May 2016 14:47:51 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <201605151447.u4FElpqr066462@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
 mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Sun, 15 May 2016 14:47:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299854 - head/sys/arm/nvidia
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.22
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 May 2016 14:47:52 -0000

Author: mmel
Date: Sun May 15 14:47:50 2016
New Revision: 299854
URL: https://svnweb.freebsd.org/changeset/base/299854

Log:
  TEGRA: Don't use common name 'gpio' for tegra specific GPIO driver.
  Using commn name for different drivers breaks generic kernel creation.

Modified:
  head/sys/arm/nvidia/tegra_gpio.c

Modified: head/sys/arm/nvidia/tegra_gpio.c
==============================================================================
--- head/sys/arm/nvidia/tegra_gpio.c	Sun May 15 14:43:52 2016	(r299853)
+++ head/sys/arm/nvidia/tegra_gpio.c	Sun May 15 14:47:50 2016	(r299854)
@@ -883,7 +883,7 @@ static device_method_t tegra_gpio_method
 };
 
 static driver_t tegra_gpio_driver = {
-	"gpio",
+	"tegra_gpio",
 	tegra_gpio_methods,
 	sizeof(struct tegra_gpio_softc),
 };
@@ -891,3 +891,8 @@ static devclass_t tegra_gpio_devclass;
 
 EARLY_DRIVER_MODULE(tegra_gpio, simplebus, tegra_gpio_driver,
     tegra_gpio_devclass, 0, 0, 70);
+
+extern devclass_t ofwgpiobus_devclass;
+extern driver_t ofw_gpiobus_driver;
+EARLY_DRIVER_MODULE(ofw_gpiobus, tegra_gpio, ofw_gpiobus_driver,
+ofwgpiobus_devclass, 0, 0, BUS_PASS_BUS);