From owner-p4-projects@FreeBSD.ORG  Sun Jan 31 10:38:44 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E1B231065679; Sun, 31 Jan 2010 10:38:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6531106566B
	for <perforce@freebsd.org>; Sun, 31 Jan 2010 10:38:43 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 941BD8FC13
	for <perforce@freebsd.org>; Sun, 31 Jan 2010 10:38:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0VAchWB034458
	for <perforce@freebsd.org>; Sun, 31 Jan 2010 10:38:43 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0VAchNr034456
	for perforce@freebsd.org; Sun, 31 Jan 2010 10:38:43 GMT
	(envelope-from raj@freebsd.org)
Date: Sun, 31 Jan 2010 10:38:43 GMT
Message-Id: <201001311038.o0VAchNr034456@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 174004 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Jan 2010 10:38:44 -0000

http://p4web.freebsd.org/chv.cgi?CH=174004

Change 174004 by raj@raj_fdt on 2010/01/31 10:38:23

	Convert mge(4) to FDT/simplebus convention.
	
	This is the very first ARM driver using IRQ resources within
	FTD/simplebus environment.

Affected files ...

.. //depot/projects/fdt/sys/arm/mv/kirkwood/kirkwood.c#4 edit
.. //depot/projects/fdt/sys/dev/mge/if_mge.c#4 edit

Differences ...

==== //depot/projects/fdt/sys/arm/mv/kirkwood/kirkwood.c#4 (text+ko) ====

@@ -84,12 +84,6 @@
 		{ -1 },
 		CPU_PM_CTRL_USB0
 	},
-	{ "mge", MV_ETH0_BASE, MV_ETH_SIZE,
-		{ MV_INT_GBERX, MV_INT_GBETX, MV_INT_GBEMISC,
-		  MV_INT_GBESUM, MV_INT_GBEERR, -1 },
-		{ -1 },
-		CPU_PM_CTRL_GE0
-	},
 	{ "sata", MV_SATAHC_BASE, MV_SATAHC_SIZE,
 		{ MV_INT_SATA, -1 },
 		{ -1 },

==== //depot/projects/fdt/sys/dev/mge/if_mge.c#4 (text+ko) ====

@@ -68,6 +68,8 @@
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
 
 #ifndef MII_ADDR_BASE
 #define MII_ADDR_BASE 8
@@ -164,7 +166,7 @@
 
 static devclass_t mge_devclass;
 
-DRIVER_MODULE(mge, mbus, mge_driver, mge_devclass, 0, 0);
+DRIVER_MODULE(mge, simplebus, mge_driver, mge_devclass, 0, 0);
 DRIVER_MODULE(miibus, mge, miibus_driver, miibus_devclass, 0, 0);
 MODULE_DEPEND(mge, ether, 1, 1, 1);
 MODULE_DEPEND(mge, miibus, 1, 1, 1);
@@ -1320,6 +1322,9 @@
 mge_probe(device_t dev)
 {
 
+	if (!ofw_bus_is_compatible(dev, "mrvl,ge"))
+		return (ENXIO);
+
 	device_set_desc(dev, "Marvell Gigabit Ethernet controller");
 	return (BUS_PROBE_DEFAULT);
 }