From owner-p4-projects@FreeBSD.ORG  Wed Jul 26 22:41:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07B0416A4E0; Wed, 26 Jul 2006 22:41:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BF92516A4DD
	for <perforce@freebsd.org>; Wed, 26 Jul 2006 22:41:43 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 88F1D43D4C
	for <perforce@freebsd.org>; Wed, 26 Jul 2006 22:41:43 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QMfhrs080278
	for <perforce@freebsd.org>; Wed, 26 Jul 2006 22:41:43 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QMfh6U080275
	for perforce@freebsd.org; Wed, 26 Jul 2006 22:41:43 GMT
	(envelope-from cognet@freebsd.org)
Date: Wed, 26 Jul 2006 22:41:43 GMT
Message-Id: <200607262241.k6QMfh6U080275@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102506 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 26 Jul 2006 22:41:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=102506

Change 102506 by cognet@cognet on 2006/07/26 22:41:07

	Move the IXP425 PCI IRQ rman initializaion to the MD code, since it
	knows which IRQ to use.

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 (text+ko) ====

@@ -101,6 +101,12 @@
         /* PCI Reset deassert */
 	reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOUTR);
 	GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg | (1U << GPIO_PCI_RESET));
+	sc->sc_irq_rman.rm_type = RMAN_ARRAY;
+	sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs";
+	if (rman_init(&sc->sc_irq_rman) != 0 ||
+	    rman_manage_region(&sc->sc_irq_rman, PCI_INT_A, PCI_INT_D) != 0)
+		panic("ixp425_md_attach: failed to set up IRQ rman");
+
 }
 
 #define	IXP425_MAX_DEV	4

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 (text+ko) ====

@@ -160,12 +160,6 @@
 		panic("ixppcib_probe: failed to set up memory rman");
 	}
 
-	sc->sc_irq_rman.rm_type = RMAN_ARRAY;
-	sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs";
-	if (rman_init(&sc->sc_irq_rman) != 0 ||
-	    rman_manage_region(&sc->sc_irq_rman, 1, 5) != 0)
-		panic("ixppcib_probe: failed to set up IRQ rman");
-
 	device_add_child(dev, "pci", -1);
 
 	return (bus_generic_attach(dev));