diff options
Diffstat (limited to 'arch/mips/alchemy/mtx-1/board_setup.c')
-rw-r--r-- | arch/mips/alchemy/mtx-1/board_setup.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c index 52d883d37dd7..6398fa95905c 100644 --- a/arch/mips/alchemy/mtx-1/board_setup.c +++ b/arch/mips/alchemy/mtx-1/board_setup.c | |||
@@ -60,9 +60,11 @@ static void mtx1_reset(char *c) | |||
60 | 60 | ||
61 | static void mtx1_power_off(void) | 61 | static void mtx1_power_off(void) |
62 | { | 62 | { |
63 | printk(KERN_ALERT "It's now safe to remove power\n"); | ||
64 | while (1) | 63 | while (1) |
65 | asm volatile (".set mips3 ; wait ; .set mips1"); | 64 | asm volatile ( |
65 | " .set mips32 \n" | ||
66 | " wait \n" | ||
67 | " .set mips0 \n"); | ||
66 | } | 68 | } |
67 | 69 | ||
68 | void __init board_setup(void) | 70 | void __init board_setup(void) |
@@ -105,14 +107,10 @@ void __init board_setup(void) | |||
105 | int | 107 | int |
106 | mtx1_pci_idsel(unsigned int devsel, int assert) | 108 | mtx1_pci_idsel(unsigned int devsel, int assert) |
107 | { | 109 | { |
108 | #define MTX_IDSEL_ONLY_0_AND_3 0 | 110 | /* This function is only necessary to support a proprietary Cardbus |
109 | #if MTX_IDSEL_ONLY_0_AND_3 | 111 | * adapter on the mtx-1 "singleboard" variant. It triggers a custom |
110 | if (devsel != 0 && devsel != 3) { | 112 | * logic chip connected to EXT_IO3 (GPIO1) to suppress IDSEL signals. |
111 | printk(KERN_ERR "*** not 0 or 3\n"); | 113 | */ |
112 | return 0; | ||
113 | } | ||
114 | #endif | ||
115 | |||
116 | if (assert && devsel != 0) | 114 | if (assert && devsel != 0) |
117 | /* Suppress signal to Cardbus */ | 115 | /* Suppress signal to Cardbus */ |
118 | alchemy_gpio_set_value(1, 0); /* set EXT_IO3 OFF */ | 116 | alchemy_gpio_set_value(1, 0); /* set EXT_IO3 OFF */ |