diff options
-rw-r--r-- | firmware/export/pp5020.h | 4 | ||||
-rw-r--r-- | firmware/system.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h index a34f1251c9..8f70794c79 100644 --- a/firmware/export/pp5020.h +++ b/firmware/export/pp5020.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #define COP_REPLY (*(volatile unsigned long *)(0x6000100c)) | 40 | #define COP_REPLY (*(volatile unsigned long *)(0x6000100c)) |
41 | 41 | ||
42 | /* Interrupts */ | 42 | /* Interrupts */ |
43 | #define CPU_INT_STAT (*(volatile unsigned long*)(0x64004000)) | 43 | #define CPU_INT_STAT (*(volatile unsigned long*)(0x60004000)) |
44 | #define COP_INT_STAT (*(volatile unsigned long*)(0x60004004)) | 44 | #define COP_INT_STAT (*(volatile unsigned long*)(0x60004004)) |
45 | #define CPU_FIQ_STAT (*(volatile unsigned long*)(0x60004008)) | 45 | #define CPU_FIQ_STAT (*(volatile unsigned long*)(0x60004008)) |
46 | #define COP_FIQ_STAT (*(volatile unsigned long*)(0x6000400c)) | 46 | #define COP_FIQ_STAT (*(volatile unsigned long*)(0x6000400c)) |
@@ -60,7 +60,7 @@ | |||
60 | #define COP_INT_CLR (*(volatile unsigned long*)(0x60004038)) | 60 | #define COP_INT_CLR (*(volatile unsigned long*)(0x60004038)) |
61 | #define COP_INT_PRIORITY (*(volatile unsigned long*)(0x6000403c)) | 61 | #define COP_INT_PRIORITY (*(volatile unsigned long*)(0x6000403c)) |
62 | 62 | ||
63 | #define CPU_HI_INT_STAT (*(volatile unsigned long*)(0x64004100)) | 63 | #define CPU_HI_INT_STAT (*(volatile unsigned long*)(0x60004100)) |
64 | #define COP_HI_INT_STAT (*(volatile unsigned long*)(0x60004104)) | 64 | #define COP_HI_INT_STAT (*(volatile unsigned long*)(0x60004104)) |
65 | #define CPU_HI_FIQ_STAT (*(volatile unsigned long*)(0x60004108)) | 65 | #define CPU_HI_FIQ_STAT (*(volatile unsigned long*)(0x60004108)) |
66 | #define COP_HI_FIQ_STAT (*(volatile unsigned long*)(0x6000410c)) | 66 | #define COP_HI_FIQ_STAT (*(volatile unsigned long*)(0x6000410c)) |
diff --git a/firmware/system.c b/firmware/system.c index 921a7d2314..e4b11e8b79 100644 --- a/firmware/system.c +++ b/firmware/system.c | |||
@@ -395,13 +395,13 @@ void system_init(void) | |||
395 | ipod_hw_rev = (*((volatile unsigned long*)(0x01fffffc))); | 395 | ipod_hw_rev = (*((volatile unsigned long*)(0x01fffffc))); |
396 | 396 | ||
397 | /* disable all irqs */ | 397 | /* disable all irqs */ |
398 | outl(-1, 0x60001138); | 398 | COP_HI_INT_CLR = -1; |
399 | outl(-1, 0x60001128); | 399 | CPU_HI_INT_CLR = -1; |
400 | outl(-1, 0x6000111c); | 400 | HI_INT_FORCED_CLR = -1; |
401 | 401 | ||
402 | outl(-1, 0x60001038); | 402 | COP_INT_CLR = -1; |
403 | outl(-1, 0x60001028); | 403 | CPU_INT_CLR = -1; |
404 | outl(-1, 0x6000101c); | 404 | INT_FORCED_CLR = -1; |
405 | 405 | ||
406 | # if NUM_CORES > 1 && defined(HAVE_ADJUSTABLE_CPU_FREQ) | 406 | # if NUM_CORES > 1 && defined(HAVE_ADJUSTABLE_CPU_FREQ) |
407 | spinlock_init(&boostctrl_mtx); | 407 | spinlock_init(&boostctrl_mtx); |