diff options
Diffstat (limited to 'arch/mips/pmc-sierra/msp71xx/msp_setup.c')
-rw-r--r-- | arch/mips/pmc-sierra/msp71xx/msp_setup.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c index 8f69b789be90..e4cc54824475 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c | |||
@@ -176,16 +176,13 @@ void __init prom_init(void) | |||
176 | case FAMILY_FPGA: | 176 | case FAMILY_FPGA: |
177 | if (FPGA_IS_MSP4200(revision)) { | 177 | if (FPGA_IS_MSP4200(revision)) { |
178 | /* Old-style revision ID */ | 178 | /* Old-style revision ID */ |
179 | mips_machgroup = MACH_GROUP_MSP; | ||
180 | mips_machtype = MACH_MSP4200_FPGA; | 179 | mips_machtype = MACH_MSP4200_FPGA; |
181 | } else { | 180 | } else { |
182 | mips_machgroup = MACH_GROUP_MSP; | ||
183 | mips_machtype = MACH_MSP_OTHER; | 181 | mips_machtype = MACH_MSP_OTHER; |
184 | } | 182 | } |
185 | break; | 183 | break; |
186 | 184 | ||
187 | case FAMILY_MSP4200: | 185 | case FAMILY_MSP4200: |
188 | mips_machgroup = MACH_GROUP_MSP; | ||
189 | #if defined(CONFIG_PMC_MSP4200_EVAL) | 186 | #if defined(CONFIG_PMC_MSP4200_EVAL) |
190 | mips_machtype = MACH_MSP4200_EVAL; | 187 | mips_machtype = MACH_MSP4200_EVAL; |
191 | #elif defined(CONFIG_PMC_MSP4200_GW) | 188 | #elif defined(CONFIG_PMC_MSP4200_GW) |
@@ -196,12 +193,10 @@ void __init prom_init(void) | |||
196 | break; | 193 | break; |
197 | 194 | ||
198 | case FAMILY_MSP4200_FPGA: | 195 | case FAMILY_MSP4200_FPGA: |
199 | mips_machgroup = MACH_GROUP_MSP; | ||
200 | mips_machtype = MACH_MSP4200_FPGA; | 196 | mips_machtype = MACH_MSP4200_FPGA; |
201 | break; | 197 | break; |
202 | 198 | ||
203 | case FAMILY_MSP7100: | 199 | case FAMILY_MSP7100: |
204 | mips_machgroup = MACH_GROUP_MSP; | ||
205 | #if defined(CONFIG_PMC_MSP7120_EVAL) | 200 | #if defined(CONFIG_PMC_MSP7120_EVAL) |
206 | mips_machtype = MACH_MSP7120_EVAL; | 201 | mips_machtype = MACH_MSP7120_EVAL; |
207 | #elif defined(CONFIG_PMC_MSP7120_GW) | 202 | #elif defined(CONFIG_PMC_MSP7120_GW) |
@@ -212,22 +207,14 @@ void __init prom_init(void) | |||
212 | break; | 207 | break; |
213 | 208 | ||
214 | case FAMILY_MSP7100_FPGA: | 209 | case FAMILY_MSP7100_FPGA: |
215 | mips_machgroup = MACH_GROUP_MSP; | ||
216 | mips_machtype = MACH_MSP7120_FPGA; | 210 | mips_machtype = MACH_MSP7120_FPGA; |
217 | break; | 211 | break; |
218 | 212 | ||
219 | default: | 213 | default: |
220 | /* we don't recognize the machine */ | 214 | /* we don't recognize the machine */ |
221 | mips_machgroup = MACH_GROUP_UNKNOWN; | ||
222 | mips_machtype = MACH_UNKNOWN; | 215 | mips_machtype = MACH_UNKNOWN; |
223 | break; | ||
224 | } | ||
225 | |||
226 | /* make sure we have the right initialization routine - sanity */ | ||
227 | if (mips_machgroup != MACH_GROUP_MSP) { | ||
228 | ppfinit("Unknown machine group in a " | ||
229 | "MSP initialization routine\n"); | ||
230 | panic("***Bogosity factor five***, exiting\n"); | 216 | panic("***Bogosity factor five***, exiting\n"); |
217 | break; | ||
231 | } | 218 | } |
232 | 219 | ||
233 | prom_init_cmdline(); | 220 | prom_init_cmdline(); |