diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/at91rm9200/cpu.c | 2 | ||||
| -rw-r--r-- | cpu/mpc85xx/pci.c | 30 |
2 files changed, 29 insertions, 3 deletions
diff --git a/cpu/at91rm9200/cpu.c b/cpu/at91rm9200/cpu.c index a7e2ca9..a464f29 100644 --- a/cpu/at91rm9200/cpu.c +++ b/cpu/at91rm9200/cpu.c @@ -121,7 +121,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) reset_cpu(0); #else #ifdef CONFIG_DBGU - AT91PS_USART us = AT91C_BASE_DBGU; + AT91PS_USART us = (AT91PS_USART) AT91C_BASE_DBGU; #endif #ifdef CONFIG_USART0 AT91PS_USART us = AT91C_BASE_US0; diff --git a/cpu/mpc85xx/pci.c b/cpu/mpc85xx/pci.c index 60c1e61..b61aab5 100644 --- a/cpu/mpc85xx/pci.c +++ b/cpu/mpc85xx/pci.c @@ -77,7 +77,7 @@ pci_mpc85xx_init(struct pci_controller *hose) pcix->powbear1 = 0x00000000; pcix->powar1 = 0x8004401c; /* 512M MEM space */ - pcix->potar2 = (CFG_PCI1_IO_BASE >> 12) & 0x000fffff; + pcix->potar2 = 0x00000000; pcix->potear2 = 0x00000000; pcix->powbar2 = (CFG_PCI1_IO_BASE >> 12) & 0x000fffff; pcix->powbear2 = 0x00000000; @@ -85,12 +85,38 @@ pci_mpc85xx_init(struct pci_controller *hose) pcix->pitar1 = 0x00000000; pcix->piwbar1 = 0x00000000; - pcix->piwar1 = 0xa0F5501f; + pcix->piwar1 = 0xa0f5501e; /* Enable, Prefetch, Local Mem, + * Snoop R/W, 2G */ /* * Hose scan. */ pci_register_hose(hose); + +#if defined(CONFIG_MPC8555CDS) || defined(CONFIG_MPC8541CDS) + /* + * This is a SW workaround for an apparent HW problem + * in the PCI controller on the MPC85555/41 CDS boards. + * The first config cycle must be to a valid, known + * device on the PCI bus in order to trick the PCI + * controller state machine into a known valid state. + * Without this, the first config cycle has the chance + * of hanging the controller permanently, just leaving + * it in a semi-working state, or leaving it working. + * + * Pick on the Tundra, Device 17, to get it right. + */ + { + u8 header_type; + + pci_hose_read_config_byte(hose, + PCI_BDF(0,17,0), + PCI_HEADER_TYPE, + &header_type); + } + +#endif + hose->last_busno = pci_hose_scan(hose); } |