diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-02-20 14:22:26 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-02-20 14:45:09 -0600 |
| commit | a551cee99ad1d1da20fd23ad265de47448852f56 (patch) | |
| tree | a6c37f4d07078beacba1c2214af79ecfb19280f6 /board/freescale/mpc8641hpcn | |
| parent | cb06eb961bdffc8728b38c242473d802e83ab2b4 (diff) | |
| download | u-boot-imx-a551cee99ad1d1da20fd23ad265de47448852f56.zip u-boot-imx-a551cee99ad1d1da20fd23ad265de47448852f56.tar.gz u-boot-imx-a551cee99ad1d1da20fd23ad265de47448852f56.tar.bz2 | |
86xx: Fix GUR PCI config registers properly.
Back in commit 975a083a5ef785c414b35f9c5b8ae25b26b41524 where
I tried to "8610HPCD: Fix typos in two PCI setup registers", I
botched it due to not realizing that 8610 and 8641 had different
Global Utility Register defintions, one of which was like 85xx,
and the other wasn't. Correct this problem by introducing two
symbols, one for each 86xx SoC, but neither of which is named
anything like 85xx.
My bad. Lovely Wednesday with git bisect. You know.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'board/freescale/mpc8641hpcn')
| -rw-r--r-- | board/freescale/mpc8641hpcn/mpc8641hpcn.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index ae79143..0e451dc 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -206,7 +206,8 @@ void pci_init_board(void) volatile immap_t *immap = (immap_t *) CFG_CCSRBAR; volatile ccsr_gur_t *gur = &immap->im_gur; uint devdisr = gur->devdisr; - uint io_sel = (gur->pordevsr & MPC86xx_PORDEVSR_IO_SEL) >> 16; + uint io_sel = (gur->pordevsr & MPC8641_PORDEVSR_IO_SEL) + >> MPC8641_PORDEVSR_IO_SEL_SHIFT; #ifdef CONFIG_PCI1 { @@ -214,7 +215,8 @@ void pci_init_board(void) extern void fsl_pci_init(struct pci_controller *hose); struct pci_controller *hose = &pci1_hose; #ifdef DEBUG - uint host1_agent = (gur->porbmsr & MPC86xx_PORBMSR_HA) >> 17; + uint host1_agent = (gur->porbmsr & MPC8641_PORBMSR_HA) + >> MPC8641_PORBMSR_HA_SHIFT; uint pex1_agent = (host1_agent == 0) || (host1_agent == 1); #endif if ((io_sel == 2 || io_sel == 3 || io_sel == 5 |