|
|
@@ -230,7 +230,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
|
|
|
{
|
|
|
@@ -238,7 +239,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
|
Wolfgang Denk