Make the PCI initialisation path use the new cpuops rather than directly

programming the reset register.
This commit is contained in:
Adrian Chadd 2010-08-19 02:05:16 +00:00
parent fd11fd075a
commit 23f10186b5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=211478

View File

@ -56,6 +56,8 @@ __FBSDID("$FreeBSD$");
#include <mips/atheros/ar71xxreg.h>
#include <mips/atheros/ar71xx_pci_bus_space.h>
#include <mips/atheros/ar71xx_cpudef.h>
#undef AR71XX_PCI_DEBUG
#ifdef AR71XX_PCI_DEBUG
#define dprintf printf
@ -258,7 +260,6 @@ ar71xx_pci_attach(device_t dev)
{
int busno = 0;
int rid = 0;
uint32_t reset;
struct ar71xx_pci_softc *sc = device_get_softc(dev);
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
@ -295,15 +296,10 @@ ar71xx_pci_attach(device_t dev)
}
/* reset PCI core and PCI bus */
reset = ATH_READ_REG(AR71XX_RST_RESET);
reset |= (RST_RESET_PCI_CORE | RST_RESET_PCI_BUS);
ATH_WRITE_REG(AR71XX_RST_RESET, reset);
ATH_READ_REG(AR71XX_RST_RESET);
ar71xx_device_stop(RST_RESET_PCI_CORE | RST_RESET_PCI_BUS);
DELAY(100000);
reset &= ~(RST_RESET_PCI_CORE | RST_RESET_PCI_BUS);
ATH_WRITE_REG(AR71XX_RST_RESET, reset);
ATH_READ_REG(AR71XX_RST_RESET);
ar71xx_device_start(RST_RESET_PCI_CORE | RST_RESET_PCI_BUS);
DELAY(100000);
/* Init PCI windows */