[MIPS] Remove mips_machtype for LASAT machines
This is the LASAT part of the mips_machtype removal. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
0b56fd8c7a
commit
b27418aa55
|
@ -22,8 +22,8 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/irq_cpu.h>
|
||||
#include <asm/lasat/lasat.h>
|
||||
#include <asm/lasat/lasatint.h>
|
||||
|
||||
#include <irq.h>
|
||||
|
@ -112,23 +112,18 @@ void __init arch_init_irq(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
switch (mips_machtype) {
|
||||
case MACH_LASAT_100:
|
||||
lasat_int_status = (void *)LASAT_INT_STATUS_REG_100;
|
||||
lasat_int_mask = (void *)LASAT_INT_MASK_REG_100;
|
||||
lasat_int_mask_shift = LASATINT_MASK_SHIFT_100;
|
||||
get_int_status = get_int_status_100;
|
||||
*lasat_int_mask = 0;
|
||||
break;
|
||||
case MACH_LASAT_200:
|
||||
if (IS_LASAT_200()) {
|
||||
lasat_int_status = (void *)LASAT_INT_STATUS_REG_200;
|
||||
lasat_int_mask = (void *)LASAT_INT_MASK_REG_200;
|
||||
lasat_int_mask_shift = LASATINT_MASK_SHIFT_200;
|
||||
get_int_status = get_int_status_200;
|
||||
*lasat_int_mask &= 0xffff;
|
||||
break;
|
||||
default:
|
||||
panic("arch_init_irq: mips_machtype incorrect");
|
||||
} else {
|
||||
lasat_int_status = (void *)LASAT_INT_STATUS_REG_100;
|
||||
lasat_int_mask = (void *)LASAT_INT_MASK_REG_100;
|
||||
lasat_int_mask_shift = LASATINT_MASK_SHIFT_100;
|
||||
get_int_status = get_int_status_100;
|
||||
*lasat_int_mask = 0;
|
||||
}
|
||||
|
||||
mips_cpu_irq_init();
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include <linux/string.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/addrspace.h>
|
||||
#include "at93c.h"
|
||||
/* New model description table */
|
||||
|
@ -66,7 +65,7 @@ static void init_flash_sizes(void)
|
|||
ls[LASAT_MTD_SERVICE] = 0xC0000;
|
||||
ls[LASAT_MTD_NORMAL] = 0x100000;
|
||||
|
||||
if (mips_machtype == MACH_LASAT_100) {
|
||||
if (!IS_LASAT_200()) {
|
||||
lasat_board_info.li_flash_base = 0x1e000000;
|
||||
|
||||
lb[LASAT_MTD_BOOTLOADER] = 0x1e400000;
|
||||
|
|
|
@ -86,18 +86,16 @@ void __init prom_init(void)
|
|||
|
||||
setup_prom_vectors();
|
||||
|
||||
if (current_cpu_data.cputype == CPU_R5000) {
|
||||
if (IS_LASAT_200()) {
|
||||
printk(KERN_INFO "LASAT 200 board\n");
|
||||
mips_machtype = MACH_LASAT_200;
|
||||
lasat_ndelay_divider = LASAT_200_DIVIDER;
|
||||
at93c = &at93c_defs[1];
|
||||
} else {
|
||||
printk(KERN_INFO "LASAT 100 board\n");
|
||||
mips_machtype = MACH_LASAT_100;
|
||||
lasat_ndelay_divider = LASAT_100_DIVIDER;
|
||||
at93c = &at93c_defs[0];
|
||||
}
|
||||
|
||||
at93c = &at93c_defs[mips_machtype];
|
||||
|
||||
lasat_init_board_info(); /* Read info from EEPROM */
|
||||
|
||||
/* Get the command line */
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/serial_8250.h>
|
||||
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/lasat/lasat.h>
|
||||
#include <asm/lasat/serial.h>
|
||||
|
||||
|
@ -47,7 +46,7 @@ static __init int lasat_uart_add(void)
|
|||
if (!pdev)
|
||||
return -ENOMEM;
|
||||
|
||||
if (mips_machtype == MACH_LASAT_100) {
|
||||
if (!IS_LASAT_200()) {
|
||||
lasat_serial_res[0].start = KSEG1ADDR(LASAT_UART_REGS_BASE_100);
|
||||
lasat_serial_res[0].end = lasat_serial_res[0].start + LASAT_UART_REGS_SHIFT_100 * 8 - 1;
|
||||
lasat_serial_res[0].flags = IORESOURCE_MEM;
|
||||
|
|
|
@ -127,9 +127,11 @@ void __init plat_time_init(void)
|
|||
void __init plat_mem_setup(void)
|
||||
{
|
||||
int i;
|
||||
lasat_misc = &lasat_misc_info[mips_machtype];
|
||||
int lasat_type = IS_LASAT_200() ? 1 : 0;
|
||||
|
||||
lasat_misc = &lasat_misc_info[lasat_type];
|
||||
#ifdef CONFIG_PICVUE
|
||||
picvue = &pvc_defs[mips_machtype];
|
||||
picvue = &pvc_defs[lasat_type];
|
||||
#endif
|
||||
|
||||
/* Set up panic notifier */
|
||||
|
@ -140,7 +142,7 @@ void __init plat_mem_setup(void)
|
|||
lasat_reboot_setup();
|
||||
|
||||
#ifdef CONFIG_DS1603
|
||||
ds1603 = &ds_defs[mips_machtype];
|
||||
ds1603 = &ds_defs[lasat_type];
|
||||
#endif
|
||||
|
||||
#ifdef DYNAMIC_SERIAL_INIT
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <linux/pci.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/lasat/lasat.h>
|
||||
|
||||
#include <irq.h>
|
||||
|
||||
|
@ -39,16 +39,10 @@ static int __init lasat_pci_setup(void)
|
|||
{
|
||||
printk(KERN_DEBUG "PCI: starting\n");
|
||||
|
||||
switch (mips_machtype) {
|
||||
case MACH_LASAT_100:
|
||||
lasat_pci_controller.pci_ops = >64xxx_pci0_ops;
|
||||
break;
|
||||
case MACH_LASAT_200:
|
||||
if (IS_LASAT_200())
|
||||
lasat_pci_controller.pci_ops = &nile4_pci_ops;
|
||||
break;
|
||||
default:
|
||||
panic("pcibios_init: mips_machtype incorrect");
|
||||
}
|
||||
else
|
||||
lasat_pci_controller.pci_ops = >64xxx_pci0_ops;
|
||||
|
||||
register_pci_controller(&lasat_pci_controller);
|
||||
|
||||
|
|
|
@ -40,12 +40,6 @@
|
|||
#define MACH_DS5800 9 /* DECsystem 5800 */
|
||||
#define MACH_DS5900 10 /* DECsystem 5900 */
|
||||
|
||||
/*
|
||||
* Valid machtype for group LASAT
|
||||
*/
|
||||
#define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */
|
||||
#define MACH_LASAT_200 1 /* Masquerade PRO/SP200 */
|
||||
|
||||
/*
|
||||
* Valid machtype for group PMC-MSP
|
||||
*/
|
||||
|
|
|
@ -240,6 +240,8 @@ static inline void lasat_ndelay(unsigned int ns)
|
|||
__delay(ns / lasat_ndelay_divider);
|
||||
}
|
||||
|
||||
#define IS_LASAT_200() (current_cpu_data.cputype == CPU_R5000)
|
||||
|
||||
#endif /* !defined (_LANGUAGE_ASSEMBLY) */
|
||||
|
||||
#define LASAT_SERVICEMODE_MAGIC_1 0xdeadbeef
|
||||
|
|
Loading…
Reference in a new issue