Date: Wed, 26 Jul 2006 22:41:43 GMT From: Olivier Houchard <cognet@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 102506 for review Message-ID: <200607262241.k6QMfh6U080275@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607262241.k6QMfh6U080275>