diff options
| author | Manuel Lauss <manuel.lauss@googlemail.com> | 2010-04-03 11:07:03 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-04-12 12:26:22 -0400 |
| commit | d8000beef2cd10c16dc5f66af715f692f5992652 (patch) | |
| tree | 3cbe44d00c9ba1e2a09b91514a20e1353089d38c /arch/mips | |
| parent | 2844e49f5ea1ae75d2026ff128b145e3bd44134c (diff) | |
MIPS: Alchemy: DB1200: Remove custom wait implementation
While playing with the out-of-tree MAE driver module, the system would
panic after a while in the db1200 custom wait code after wakeup due to
a clobbered k0 register being used as target address of a store op.
Remove the custom wait implementation and revert back to the Alchemy-
recommended implementation already set as default.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/1092/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/alchemy/devboards/db1200/setup.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/arch/mips/alchemy/devboards/db1200/setup.c b/arch/mips/alchemy/devboards/db1200/setup.c index 379536e3abd..be7e92ea01f 100644 --- a/arch/mips/alchemy/devboards/db1200/setup.c +++ b/arch/mips/alchemy/devboards/db1200/setup.c | |||
| @@ -60,43 +60,6 @@ void __init board_setup(void) | |||
| 60 | wmb(); | 60 | wmb(); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | /* use the hexleds to count the number of times the cpu has entered | ||
| 64 | * wait, the dots to indicate whether the CPU is currently idle or | ||
| 65 | * active (dots off = sleeping, dots on = working) for cases where | ||
| 66 | * the number doesn't change for a long(er) period of time. | ||
| 67 | */ | ||
| 68 | static void db1200_wait(void) | ||
| 69 | { | ||
| 70 | __asm__(" .set push \n" | ||
| 71 | " .set mips3 \n" | ||
| 72 | " .set noreorder \n" | ||
| 73 | " cache 0x14, 0(%0) \n" | ||
| 74 | " cache 0x14, 32(%0) \n" | ||
| 75 | " cache 0x14, 64(%0) \n" | ||
| 76 | /* dots off: we're about to call wait */ | ||
| 77 | " lui $26, 0xb980 \n" | ||
| 78 | " ori $27, $0, 3 \n" | ||
| 79 | " sb $27, 0x18($26) \n" | ||
| 80 | " sync \n" | ||
| 81 | " nop \n" | ||
| 82 | " wait \n" | ||
| 83 | " nop \n" | ||
| 84 | " nop \n" | ||
| 85 | " nop \n" | ||
| 86 | " nop \n" | ||
| 87 | " nop \n" | ||
| 88 | /* dots on: there's work to do, increment cntr */ | ||
| 89 | " lui $26, 0xb980 \n" | ||
| 90 | " sb $0, 0x18($26) \n" | ||
| 91 | " lui $26, 0xb9c0 \n" | ||
| 92 | " lb $27, 0($26) \n" | ||
| 93 | " addiu $27, $27, 1 \n" | ||
| 94 | " sb $27, 0($26) \n" | ||
| 95 | " sync \n" | ||
| 96 | " .set pop \n" | ||
| 97 | : : "r" (db1200_wait)); | ||
| 98 | } | ||
| 99 | |||
| 100 | static int __init db1200_arch_init(void) | 63 | static int __init db1200_arch_init(void) |
| 101 | { | 64 | { |
| 102 | /* GPIO7 is low-level triggered CPLD cascade */ | 65 | /* GPIO7 is low-level triggered CPLD cascade */ |
| @@ -110,9 +73,6 @@ static int __init db1200_arch_init(void) | |||
| 110 | irq_to_desc(DB1200_SD0_INSERT_INT)->status |= IRQ_NOAUTOEN; | 73 | irq_to_desc(DB1200_SD0_INSERT_INT)->status |= IRQ_NOAUTOEN; |
| 111 | irq_to_desc(DB1200_SD0_EJECT_INT)->status |= IRQ_NOAUTOEN; | 74 | irq_to_desc(DB1200_SD0_EJECT_INT)->status |= IRQ_NOAUTOEN; |
| 112 | 75 | ||
| 113 | if (cpu_wait) | ||
| 114 | cpu_wait = db1200_wait; | ||
| 115 | |||
| 116 | return 0; | 76 | return 0; |
| 117 | } | 77 | } |
| 118 | arch_initcall(db1200_arch_init); | 78 | arch_initcall(db1200_arch_init); |