37c37
< __FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_pci.c 172394 2007-09-30 11:05:18Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_pci.c 186352 2008-12-20 03:26:09Z sam $");
92,93c92
<
< device_set_desc(dev, "IXP425 PCI Bus");
---
> device_set_desc(dev, "IXP4XX PCI Bus");
133,134c132,133
< #define AHB_OFFSET 0x10000000UL
< if (bus_dma_tag_create(NULL, 1, 0, AHB_OFFSET + 64 * 1024 * 1024,
---
> /* NB: PCI dma window is 64M so anything above must be bounced */
> if (bus_dma_tag_create(NULL, 1, 0, IXP425_AHB_OFFSET + 64 * 1024 * 1024,
156c155
< sc->sc_io_rman.rm_descr = "IXP425 PCI I/O Ports";
---
> sc->sc_io_rman.rm_descr = "IXP4XX PCI I/O Ports";
164c163
< sc->sc_mem_rman.rm_descr = "IXP425 PCI Memory";
---
> sc->sc_mem_rman.rm_descr = "IXP4XX PCI Memory";
176,179c175,178
< (AHB_OFFSET & 0xFF000000) +
< ((AHB_OFFSET & 0xFF000000) >> 8) +
< ((AHB_OFFSET & 0xFF000000) >> 16) +
< ((AHB_OFFSET & 0xFF000000) >> 24) +
---
> (IXP425_AHB_OFFSET & 0xFF000000) +
> ((IXP425_AHB_OFFSET & 0xFF000000) >> 8) +
> ((IXP425_AHB_OFFSET & 0xFF000000) >> 16) +
> ((IXP425_AHB_OFFSET & 0xFF000000) >> 24) +
186,189c185,188
< IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR0, AHB_OFFSET + 0x00000000);
< IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR1, AHB_OFFSET + 0x01000000);
< IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR2, AHB_OFFSET + 0x02000000);
< IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR3, AHB_OFFSET + 0x03000000);
---
> IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR0, IXP425_AHB_OFFSET + 0x00000000);
> IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR1, IXP425_AHB_OFFSET + 0x01000000);
> IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR2, IXP425_AHB_OFFSET + 0x02000000);
> IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR3, IXP425_AHB_OFFSET + 0x03000000);