diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2006-12-01 20:02:30 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-12-01 20:02:30 +0100 |
| commit | 701f649aa304e547639fb8bbfdfec0753e9b3b9a (patch) | |
| tree | cf491729e5ca4a222a7fd7fe7205e5157de05f77 /board/tqm834x/pci.c | |
| parent | 5c97aeb8d8b780b10a1cb0beaca196c009f5a62a (diff) | |
| parent | dd520bf314c7add4183c5191692180f576f96b60 (diff) | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'board/tqm834x/pci.c')
| -rw-r--r-- | board/tqm834x/pci.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/board/tqm834x/pci.c b/board/tqm834x/pci.c index 5a23e6c55e9..d896f17aad0 100644 --- a/board/tqm834x/pci.c +++ b/board/tqm834x/pci.c @@ -69,17 +69,17 @@ void pci_init_board(void) { volatile immap_t * immr; - volatile clk8349_t * clk; - volatile law8349_t * pci_law; - volatile pot8349_t * pci_pot; - volatile pcictrl8349_t * pci_ctrl; - volatile pciconf8349_t * pci_conf; + volatile clk83xx_t * clk; + volatile law83xx_t * pci_law; + volatile pot83xx_t * pci_pot; + volatile pcictrl83xx_t * pci_ctrl; + volatile pciconf83xx_t * pci_conf; u16 reg16; u32 reg32; struct pci_controller * hose; - immr = (immap_t *)CFG_IMMRBAR; - clk = (clk8349_t *)&immr->clk; + immr = (immap_t *)CFG_IMMR; + clk = (clk83xx_t *)&immr->clk; pci_law = immr->sysconf.pcilaw; pci_pot = immr->ios.pot; pci_ctrl = immr->pci_ctrl; @@ -186,8 +186,8 @@ pci_init_board(void) hose->region_count = 3; pci_setup_indirect(hose, - (CFG_IMMRBAR+0x8300), - (CFG_IMMRBAR+0x8304)); + (CFG_IMMR+0x8300), + (CFG_IMMR+0x8304)); pci_register_hose(hose); |