[MIPS] Remove mips_machtype from ARC based machines

This is the ARC part of the mips_machtype removal.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 23066985a73407c428c7aec76adc17a9702fcd57..0ce9acf10c39694ce64c054f4484ee46c313149a 100644 (file)
--- a/arch/mips/fw/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -22,7 +22,6 @@
 struct smatch {
        char *arcname;
        char *liname;
-       int type;
        int flags;
 };
 
@@ -30,47 +29,38 @@ static struct smatch mach_table[] = {
        {
                .arcname        = "SGI-IP22",
                .liname         = "SGI Indy",
-               .type           = MACH_SGI_IP22,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP27",
                .liname         = "SGI Origin",
-               .type           = MACH_SGI_IP27,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP28",
                .liname         = "SGI IP28",
-               .type           = MACH_SGI_IP28,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP30",
                .liname         = "SGI Octane",
-               .type           = MACH_SGI_IP30,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP32",
                .liname         = "SGI O2",
-               .type           = MACH_SGI_IP32,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "Microsoft-Jazz",
                .liname         = "Jazz MIPS_Magnum_4000",
-               .type           = MACH_MIPS_MAGNUM_4000,
                .flags          = 0,
        }, {
                .arcname        = "PICA-61",
                .liname         = "Jazz Acer_PICA_61",
-               .type           = MACH_ACER_PICA_61,
                .flags          = 0,
        }, {
                .arcname        = "RM200PCI",
                .liname         = "SNI RM200_PCI",
-               .type           = MACH_SNI_RM200_PCI,
                .flags          = PROM_FLAG_DONT_FREE_TEMP,
        }, {
                .arcname        = "RM200PCI-R5K",
                .liname         = "SNI RM200_PCI-R5K",
-               .type           = MACH_SNI_RM200_PCI,
                .flags          = PROM_FLAG_DONT_FREE_TEMP,
        }
 };
@@ -121,6 +111,5 @@ void __init prom_identify_arch(void)
        mach = string_to_mach(iname);
        system_type = mach->liname;
 
-       mips_machtype = mach->type;
        prom_flags = mach->flags;
 }

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index f136c8a8591c8ddf6ca4365981a1c04a1f7259c2..f60524e8bc44a7d1e74e1a9455749b811ecf3326 100644 (file)
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,8 +76,7 @@ void __init plat_mem_setup(void)
 
        set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
-       if (mips_machtype == MACH_MIPS_MAGNUM_4000)
-               EISA_bus = 1;
+       EISA_bus = 1;
 #endif
 
        /* request I/O space for devices used on all i[345]86 PCs */

diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index c70848d4f6320d1750af33ff70138cd0fba1d42a..653096a69d166fb6f406a7cf2537e761d37e82c1 100644 (file)
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -25,13 +25,6 @@
  */
 #define  MACH_UNKNOWN          0       /* whatever...                  */
 
-/*
- * Valid machtype values for group JAZZ
- */
-#define  MACH_ACER_PICA_61     0       /* Acer PICA-61 (PICA1)         */
-#define  MACH_MIPS_MAGNUM_4000 1       /* Mips Magnum 4000 "RC4030"    */
-#define  MACH_OLIVETTI_M700    2       /* Olivetti M700-10 (-15 ??)    */
-
 /*
  * Valid machtype for group DEC
  */
@@ -47,20 +40,6 @@
 #define  MACH_DS5800           9       /* DECsystem 5800               */
 #define  MACH_DS5900           10      /* DECsystem 5900               */
 
-/*
- * Valid machtype for group SNI_RM
- */
-#define  MACH_SNI_RM200_PCI    0       /* RM200/RM300/RM400 PCI series */
-
-/*
- * Valid machtype for group SGI
- */
-#define  MACH_SGI_IP22         0       /* Indy, Indigo2, Challenge S   */
-#define  MACH_SGI_IP27         1       /* Origin 200, Origin 2000, Onyx 2 */
-#define  MACH_SGI_IP28         2       /* Indigo2 Impact               */
-#define  MACH_SGI_IP32         3       /* O2                           */
-#define  MACH_SGI_IP30         4       /* Octane, Octane2              */
-
 /*
  * Valid machtype for group LASAT
  */