diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/at91rm9200/cpu.c | 14 | ||||
| -rw-r--r-- | cpu/pxa/interrupts.c | 11 |
2 files changed, 22 insertions, 3 deletions
diff --git a/cpu/at91rm9200/cpu.c b/cpu/at91rm9200/cpu.c index a464f29aeb..71463c957e 100644 --- a/cpu/at91rm9200/cpu.c +++ b/cpu/at91rm9200/cpu.c @@ -134,12 +134,26 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /*shutdown the console to avoid strange chars during reset */ us->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX); +#ifdef CONFIG_AT91RM9200DK /* Clear PA19 to trigger the hard reset */ pio->PIO_CODR = 0x00080000; pio->PIO_OER = 0x00080000; pio->PIO_PER = 0x00080000; +#endif +#ifdef CONFIG_CMC_PU2 +/* this is the way Linux does it */ +#define AT91C_ST_RSTEN (0x1 << 16) +#define AT91C_ST_EXTEN (0x1 << 17) +#define AT91C_ST_WDRST (0x1 << 0) +/* watchdog mode register */ +#define ST_WDMR *((unsigned long *)0xfffffd08) +/* system clock control register */ +#define ST_CR *((unsigned long *)0xfffffd00) + ST_WDMR = AT91C_ST_RSTEN | AT91C_ST_EXTEN | 1 ; + ST_CR = AT91C_ST_WDRST; /* Never reached */ #endif +#endif return 0; } diff --git a/cpu/pxa/interrupts.c b/cpu/pxa/interrupts.c index 8aec0b9dd6..fd02154b86 100644 --- a/cpu/pxa/interrupts.c +++ b/cpu/pxa/interrupts.c @@ -193,9 +193,14 @@ void udelay_masked (unsigned long usec) { ulong tmo; - tmo = usec / 1000; - tmo *= CFG_HZ; - tmo /= 1000; + if (usec >= 1000) { + tmo = usec / 1000; + tmo *= CFG_HZ; + tmo /= 1000; + } else { + tmo = usec * CFG_HZ; + tmo /= (1000*1000); + } reset_timer_masked (); |