11 files changed, 86 insertions, 81 deletions

diff --git a/arch/mips/vr41xx/common/bcu.c b/arch/mips/vr41xx/common/bcu.c
index ff272b2e8395..d77c330a0d59 100644
--- a/arch/mips/vr41xx/common/bcu.c
+++ b/arch/mips/vr41xx/common/bcu.c
@@ -70,7 +70,7 @@ EXPORT_SYMBOL_GPL(vr41xx_get_tclock_frequency);
 
 static inline uint16_t read_clkspeed(void)
 {
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121: return readw(CLKSPEEDREG_TYPE1);
         case CPU_VR4122:
@@ -88,7 +88,7 @@ static inline unsigned long calculate_pclock(uint16_t clkspeed)
 {
         unsigned long pclock = 0;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 pclock = 18432000 * 64;
@@ -138,7 +138,7 @@ static inline unsigned long calculate_vtclock(uint16_t clkspeed, unsigned long p
 {
         unsigned long vtclock = 0;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
                 /* The NEC VR4111 doesn't have the VTClock. */
                 break;
@@ -180,7 +180,7 @@ static inline unsigned long calculate_tclock(uint16_t clkspeed, unsigned long pc
 {
         unsigned long tclock = 0;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
                 if (!(clkspeed & DIV2B))
                         tclock = pclock / 2;
diff --git a/arch/mips/vr41xx/common/cmu.c b/arch/mips/vr41xx/common/cmu.c
index 657c5133c933..ad0e8e3409d9 100644
--- a/arch/mips/vr41xx/common/cmu.c
+++ b/arch/mips/vr41xx/common/cmu.c
@@ -95,8 +95,8 @@ void vr41xx_supply_clock(vr41xx_clock_t clock)
                 cmuclkmsk |= MSKFIR | MSKFFIR;
                 break;
         case DSIU_CLOCK:
-                if (current_cpu_data.cputype == CPU_VR4111 ||
-                    current_cpu_data.cputype == CPU_VR4121)
+                if (current_cpu_type() == CPU_VR4111 ||
+                    current_cpu_type() == CPU_VR4121)
                         cmuclkmsk |= MSKDSIU;
                 else
                         cmuclkmsk |= MSKSIU | MSKDSIU;
@@ -146,8 +146,8 @@ void vr41xx_mask_clock(vr41xx_clock_t clock)
                 cmuclkmsk &= ~MSKPIU;
                 break;
         case SIU_CLOCK:
-                if (current_cpu_data.cputype == CPU_VR4111 ||
-                    current_cpu_data.cputype == CPU_VR4121) {
+                if (current_cpu_type() == CPU_VR4111 ||
+                    current_cpu_type() == CPU_VR4121) {
                         cmuclkmsk &= ~(MSKSIU | MSKSSIU);
                 } else {
                         if (cmuclkmsk & MSKDSIU)
@@ -166,8 +166,8 @@ void vr41xx_mask_clock(vr41xx_clock_t clock)
                 cmuclkmsk &= ~(MSKFIR | MSKFFIR);
                 break;
         case DSIU_CLOCK:
-                if (current_cpu_data.cputype == CPU_VR4111 ||
-                    current_cpu_data.cputype == CPU_VR4121) {
+                if (current_cpu_type() == CPU_VR4111 ||
+                    current_cpu_type() == CPU_VR4121) {
                         cmuclkmsk &= ~MSKDSIU;
                 } else {
                         if (cmuclkmsk & MSKSSIU)
@@ -216,7 +216,7 @@ static int __init vr41xx_cmu_init(void)
 {
         unsigned long start, size;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 start = CMU_TYPE1_BASE;
@@ -246,7 +246,7 @@ static int __init vr41xx_cmu_init(void)
         }
 
         cmuclkmsk = cmu_read(CMUCLKMSK);
-        if (current_cpu_data.cputype == CPU_VR4133)
+        if (current_cpu_type() == CPU_VR4133)
                 cmuclkmsk2 = cmu_read(CMUCLKMSK2);
 
         spin_lock_init(&cmu_lock);
diff --git a/arch/mips/vr41xx/common/giu.c b/arch/mips/vr41xx/common/giu.c
index d21f6f2d22a3..2b272f1496fe 100644
--- a/arch/mips/vr41xx/common/giu.c
+++ b/arch/mips/vr41xx/common/giu.c
@@ -81,7 +81,7 @@ static int __init vr41xx_giu_add(void)
         if (!pdev)
                 return -ENOMEM;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 pdev->id = GPIO_50PINS_PULLUPDOWN;
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
index adabc6bad440..1899601e5862 100644
--- a/arch/mips/vr41xx/common/icu.c
+++ b/arch/mips/vr41xx/common/icu.c
@@ -157,8 +157,8 @@ void vr41xx_enable_piuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + PIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MPIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -172,8 +172,8 @@ void vr41xx_disable_piuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + PIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MPIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -187,8 +187,8 @@ void vr41xx_enable_aiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + AIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MAIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -202,8 +202,8 @@ void vr41xx_disable_aiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + AIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MAIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -217,8 +217,8 @@ void vr41xx_enable_kiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + KIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MKIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -232,8 +232,8 @@ void vr41xx_disable_kiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + KIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MKIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -319,9 +319,9 @@ void vr41xx_enable_pciint(void)
         struct irq_desc *desc = irq_desc + PCI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MPCIINTREG, PCIINT0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -335,9 +335,9 @@ void vr41xx_disable_pciint(void)
         struct irq_desc *desc = irq_desc + PCI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MPCIINTREG, 0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -351,9 +351,9 @@ void vr41xx_enable_scuint(void)
         struct irq_desc *desc = irq_desc + SCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MSCUINTREG, SCUINT0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -367,9 +367,9 @@ void vr41xx_disable_scuint(void)
         struct irq_desc *desc = irq_desc + SCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MSCUINTREG, 0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -383,9 +383,9 @@ void vr41xx_enable_csiint(uint16_t mask)
         struct irq_desc *desc = irq_desc + CSI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_set(MCSIINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -399,9 +399,9 @@ void vr41xx_disable_csiint(uint16_t mask)
         struct irq_desc *desc = irq_desc + CSI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_clear(MCSIINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -415,9 +415,9 @@ void vr41xx_enable_bcuint(void)
         struct irq_desc *desc = irq_desc + BCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MBCUINTREG, BCUINTR);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -431,9 +431,9 @@ void vr41xx_disable_bcuint(void)
         struct irq_desc *desc = irq_desc + BCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MBCUINTREG, 0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -608,7 +608,7 @@ int vr41xx_set_intassign(unsigned int irq, unsigned char intassign)
 {
         int retval = -EINVAL;
 
-        if (current_cpu_data.cputype != CPU_VR4133)
+        if (current_cpu_type() != CPU_VR4133)
                 return -EINVAL;
 
         if (intassign > INTASSIGN_MAX)
@@ -665,7 +665,7 @@ static int __init vr41xx_icu_init(void)
         unsigned long icu1_start, icu2_start;
         int i;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 icu1_start = ICU1_TYPE1_BASE;
diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index 4f97e0ba9e24..407cec203b29 100644
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -36,7 +36,7 @@ static void __init iomem_resource_init(void)
         iomem_resource.end = IO_MEM_RESOURCE_END;
 }
 
-static void __init setup_timer_frequency(void)
+void __init plat_time_init(void)
 {
         unsigned long tclock;
 
@@ -53,16 +53,10 @@ void __init plat_timer_setup(struct irqaction *irq)
         setup_irq(TIMER_IRQ, irq);
 }
 
-static void __init timer_init(void)
-{
-        board_time_init = setup_timer_frequency;
-}
-
 void __init plat_mem_setup(void)
 {
         vr41xx_calculate_clock_frequency();
 
-        timer_init();
         iomem_resource_init();
 }
 
diff --git a/arch/mips/vr41xx/common/pmu.c b/arch/mips/vr41xx/common/pmu.c
index 5e469796413f..028aaf75eb21 100644
--- a/arch/mips/vr41xx/common/pmu.c
+++ b/arch/mips/vr41xx/common/pmu.c
@@ -1,7 +1,7 @@
 /*
  *  pmu.c, Power Management Unit routines for NEC VR4100 series.
  *
- *  Copyright (C) 2003-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2003-2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,11 +22,13 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/pm.h>
-#include <linux/smp.h>
+#include <linux/sched.h>
 #include <linux/types.h>
 
+#include <asm/cacheflush.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
+#include <asm/processor.h>
 #include <asm/reboot.h>
 #include <asm/system.h>
 
@@ -44,11 +46,23 @@ static void __iomem *pmu_base;
 #define pmu_read(offset)                readw(pmu_base + (offset))
 #define pmu_write(offset, value)        writew((value), pmu_base + (offset))
 
+static void vr41xx_cpu_wait(void)
+{
+        local_irq_disable();
+        if (!need_resched())
+                /*
+                 * "standby" sets IE bit of the CP0_STATUS to 1.
+                 */
+                __asm__("standby;\n");
+        else
+                local_irq_enable();
+}
+
 static inline void software_reset(void)
 {
         uint16_t pmucnt2;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4122:
         case CPU_VR4131:
         case CPU_VR4133:
@@ -57,6 +71,11 @@ static inline void software_reset(void)
                 pmu_write(PMUCNT2REG, pmucnt2);
                 break;
         default:
+                set_c0_status(ST0_BEV | ST0_ERL);
+                change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
+                flush_cache_all();
+                write_c0_wired(0);
+                __asm__("jr     %0"::"r"(0xbfc00000));
                 break;
         }
 }
@@ -65,7 +84,6 @@ static void vr41xx_restart(char *command)
 {
         local_irq_disable();
         software_reset();
-        printk(KERN_NOTICE "\nYou can reset your system\n");
         while (1) ;
 }
 
@@ -73,21 +91,14 @@ static void vr41xx_halt(void)
 {
         local_irq_disable();
         printk(KERN_NOTICE "\nYou can turn off the power supply\n");
-        while (1) ;
-}
-
-static void vr41xx_power_off(void)
-{
-        local_irq_disable();
-        printk(KERN_NOTICE "\nYou can turn off the power supply\n");
-        while (1) ;
+        __asm__("hibernate;\n");
 }
 
 static int __init vr41xx_pmu_init(void)
 {
         unsigned long start, size;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 start = PMU_TYPE1_BASE;
@@ -113,9 +124,10 @@ static int __init vr41xx_pmu_init(void)
                 return -EBUSY;
         }
 
+        cpu_wait = vr41xx_cpu_wait;
         _machine_restart = vr41xx_restart;
         _machine_halt = vr41xx_halt;
-        pm_power_off = vr41xx_power_off;
+        pm_power_off = vr41xx_halt;
 
         return 0;
 }
diff --git a/arch/mips/vr41xx/common/rtc.c b/arch/mips/vr41xx/common/rtc.c
index cce605b3d688..9f26c14edcac 100644
--- a/arch/mips/vr41xx/common/rtc.c
+++ b/arch/mips/vr41xx/common/rtc.c
@@ -82,7 +82,7 @@ static int __init vr41xx_rtc_add(void)
         if (!pdev)
                 return -ENOMEM;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 res = rtc_type1_resource;
diff --git a/arch/mips/vr41xx/common/siu.c b/arch/mips/vr41xx/common/siu.c
index a1e774142163..b735f45b25f0 100644
--- a/arch/mips/vr41xx/common/siu.c
+++ b/arch/mips/vr41xx/common/siu.c
@@ -83,7 +83,7 @@ static int __init vr41xx_siu_add(void)
         if (!pdev)
                 return -ENOMEM;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 pdev->dev.platform_data = siu_type1_ports;
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c
index ae1af6b21c45..7c5e18ee2231 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/init.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/init.c
@@ -36,7 +36,7 @@ void disable_pcnet(void)
          */
 
         writel((2 << 16)                |
-               (PCI_DEVFN(1,0) << 8)    |
+               (PCI_DEVFN(1, 0) << 8)   |
                (0 & 0xfc)               |
                1UL,
                PCICONFAREG);
@@ -44,7 +44,7 @@ void disable_pcnet(void)
         data = readl(PCICONFDREG);
 
         writel((2 << 16)                |
-               (PCI_DEVFN(1,0) << 8)    |
+               (PCI_DEVFN(1, 0) << 8)   |
                (4 & 0xfc)               |
                1UL,
                PCICONFAREG);
@@ -52,7 +52,7 @@ void disable_pcnet(void)
         data = readl(PCICONFDREG);
 
         writel((2 << 16)                |
-               (PCI_DEVFN(1,0) << 8)    |
+               (PCI_DEVFN(1, 0) << 8)   |
                (4 & 0xfc)               |
                1UL,
                PCICONFAREG);
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
index f45caccedc07..1341f3287d04 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
@@ -38,7 +38,7 @@
                 outb_p((dev_no), DATA_PORT(port));      \
         } while(0)
 
-#define WRITE_CONFIG_DATA(port,index,data)              \
+#define WRITE_CONFIG_DATA(port, index, data)            \
         do {                                            \
                 outb_p((index), INDEX_PORT(port));      \
                 outb_p((data), DATA_PORT(port));        \
@@ -206,8 +206,8 @@ static inline u16 ali_config_readw(u8 reg, int devfn)
 int vr4133_rockhopper = 0;
 void __init ali_m5229_preinit(void)
 {
-        if (ali_config_readw(PCI_VENDOR_ID,16) == PCI_VENDOR_ID_AL &&
-            ali_config_readw(PCI_DEVICE_ID,16) == PCI_DEVICE_ID_AL_M1533) {
+        if (ali_config_readw(PCI_VENDOR_ID, 16) == PCI_VENDOR_ID_AL &&
+            ali_config_readw(PCI_DEVICE_ID, 16) == PCI_DEVICE_ID_AL_M1533) {
                 printk(KERN_INFO "Found an NEC Rockhopper \n");
                 vr4133_rockhopper = 1;
                 /*
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index b20b93b2b95e..58e47686b499 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -64,7 +64,6 @@ static void __init nec_cmbvr4133_setup(void)
 #endif
         set_io_port_base(KSEG1ADDR(0x16000000));
 
-        mips_machgroup = MACH_GROUP_NEC_VR41XX;
         mips_machtype = MACH_NEC_CMBVR4133;
 
 #ifdef CONFIG_PCI