diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-30 02:01:32 +0100 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-30 02:01:32 +0100 | 
| commit | ab07b6c221da99442b6c93986ca30607c6289bf0 (patch) | |
| tree | 610bccb5c1ebd790004268f1efc3a4f29ed3d3bb /board/tqm834x/pci.c | |
| parent | 8d9a8610b8256331132227e9e6585c6bd5742787 (diff) | |
| parent | 1939d969443ccf316cab2bf32ab1027d4db5ba1a (diff) | |
| download | olio-uboot-2014.01-ab07b6c221da99442b6c93986ca30607c6289bf0.tar.xz olio-uboot-2014.01-ab07b6c221da99442b6c93986ca30607c6289bf0.zip | |
Merge with http://opensource.freescale.com/pub/scm/u-boot-83xx.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 5a23e6c55..d896f17aa 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); |