d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
programming the reset register.
This commit is contained in:
adrian 2010-08-19 02:05:16 +00:00
parent 0a99afe1b0
commit c5b5c26e92
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/mips/atheros/ar71xx_pci.c
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 */