5 files changed, 11 insertions, 28 deletions

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index 6fa85728158b..ab96a2d7f4c4 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -163,7 +163,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
                 CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq);
         *CIC_EXT_CFG_REG = cic_ext;
 
-        return request_irq(hirq->irq, hwbutton_handler, SA_INTERRUPT,
+        return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
                                 hirq->name, (void *)hirq);
 }
 
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_serial.c b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
index e25bac537d77..15e7b8000b4c 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_serial.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
@@ -117,7 +117,7 @@ void __init msp_serial_setup(void)
 
         /* Initialize first serial port */
         up.mapbase      = MSP_UART0_BASE;
-        up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+        up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
         up.irq          = MSP_INT_UART0;
         up.uartclk      = uartclk;
         up.regshift     = 2;
@@ -145,9 +145,9 @@ void __init msp_serial_setup(void)
                         if( DEBUG_PORT_BASE == KSEG1ADDR(MSP_UART1_BASE) ) {
                                 if( mips_machtype == MACH_MSP4200_FPGA
                                  || mips_machtype == MACH_MSP7120_FPGA )
-                                        initDebugPort(uartclk,19200);
+                                        initDebugPort(uartclk, 19200);
                                 else
-                                        initDebugPort(uartclk,57600);
+                                        initDebugPort(uartclk, 57600);
                         }
 #endif
                         break;
@@ -157,7 +157,7 @@ void __init msp_serial_setup(void)
         }
 
         up.mapbase      = MSP_UART1_BASE;
-        up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+        up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
         up.irq          = MSP_INT_UART1;
         up.line         = 1;
         up.private_data         = (void*)UART1_STATUS_REG;
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
index 8f69b789be90..c93675615f5d 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -25,7 +25,6 @@
 #define MSP_BOARD_RESET_GPIO    9
 #endif
 
-extern void msp_timer_init(void);
 extern void msp_serial_setup(void);
 extern void pmctwiled_setup(void);
 
@@ -149,8 +148,6 @@ void __init plat_mem_setup(void)
         _machine_restart = msp_restart;
         _machine_halt = msp_halt;
         pm_power_off = msp_power_off;
-
-        board_time_init = msp_timer_init;
 }
 
 void __init prom_init(void)
@@ -176,16 +173,13 @@ void __init prom_init(void)
         case FAMILY_FPGA:
                 if (FPGA_IS_MSP4200(revision)) {
                         /* Old-style revision ID */
-                        mips_machgroup = MACH_GROUP_MSP;
                         mips_machtype = MACH_MSP4200_FPGA;
                 } else {
-                        mips_machgroup = MACH_GROUP_MSP;
                         mips_machtype = MACH_MSP_OTHER;
                 }
                 break;
 
         case FAMILY_MSP4200:
-                mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP4200_EVAL)
                 mips_machtype  = MACH_MSP4200_EVAL;
 #elif defined(CONFIG_PMC_MSP4200_GW)
@@ -196,12 +190,10 @@ void __init prom_init(void)
                 break;
 
         case FAMILY_MSP4200_FPGA:
-                mips_machgroup = MACH_GROUP_MSP;
                 mips_machtype  = MACH_MSP4200_FPGA;
                 break;
 
         case FAMILY_MSP7100:
-                mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP7120_EVAL)
                 mips_machtype = MACH_MSP7120_EVAL;
 #elif defined(CONFIG_PMC_MSP7120_GW)
@@ -212,22 +204,14 @@ void __init prom_init(void)
                 break;
 
         case FAMILY_MSP7100_FPGA:
-                mips_machgroup = MACH_GROUP_MSP;
                 mips_machtype  = MACH_MSP7120_FPGA;
                 break;
 
         default:
                 /* we don't recognize the machine */
-                mips_machgroup = MACH_GROUP_UNKNOWN;
                 mips_machtype  = MACH_UNKNOWN;
-                break;
-        }
-
-        /* make sure we have the right initialization routine - sanity */
-        if (mips_machgroup != MACH_GROUP_MSP) {
-                ppfinit("Unknown machine group in a "
-                        "MSP initialization routine\n");
                 panic("***Bogosity factor five***, exiting\n");
+                break;
         }
 
         prom_init_cmdline();
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c b/arch/mips/pmc-sierra/msp71xx/msp_time.c
index 2a2beac5a4f8..f221d4763625 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_time.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_time.c
@@ -36,7 +36,7 @@
 #include <msp_int.h>
 #include <msp_regs.h>
 
-void __init msp_timer_init(void)
+void __init plat_time_init(void)
 {
         char    *endp, *s;
         unsigned long cpu_rate = 0;
@@ -81,7 +81,6 @@ void __init msp_timer_init(void)
         mips_hpt_frequency = cpu_rate/2;
 }
 
-
 void __init plat_timer_setup(struct irqaction *irq)
 {
 #ifdef CONFIG_IRQ_MSP_CIC
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_usb.c b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
index 21f9c70b6923..f7ca4f582331 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_usb.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
@@ -58,7 +58,7 @@ static struct platform_device msp_usbhost_device = {
                 .dma_mask = &msp_usbhost_dma_mask,
                 .coherent_dma_mask = DMA_32BIT_MASK,
         },
-        .num_resources  = ARRAY_SIZE (msp_usbhost_resources),
+        .num_resources  = ARRAY_SIZE(msp_usbhost_resources),
         .resource       = msp_usbhost_resources,
 };
 #endif /* CONFIG_USB_EHCI_HCD */
@@ -86,7 +86,7 @@ static struct platform_device msp_usbdev_device = {
                 .dma_mask = &msp_usbdev_dma_mask,
                 .coherent_dma_mask = DMA_32BIT_MASK,
         },
-        .num_resources  = ARRAY_SIZE (msp_usbdev_resources),
+        .num_resources  = ARRAY_SIZE(msp_usbdev_resources),
         .resource       = msp_usbdev_resources,
 };
 #endif /* CONFIG_USB_GADGET */
@@ -129,7 +129,7 @@ static int __init msp_usb_setup(void)
                 ppfinit("platform add USB HOST done %s.\n",
                             msp_devs[0]->name);
 
-                result = platform_add_devices(msp_devs, ARRAY_SIZE (msp_devs));
+                result = platform_add_devices(msp_devs, ARRAY_SIZE(msp_devs));
 #endif /* CONFIG_USB_EHCI_HCD */
         }
 #if defined(CONFIG_USB_GADGET)
@@ -139,7 +139,7 @@ static int __init msp_usb_setup(void)
                 ppfinit("platform add USB DEVICE done %s.\n",
                             msp_devs[0]->name);
 
-                result = platform_add_devices(msp_devs, ARRAY_SIZE (msp_devs));
+                result = platform_add_devices(msp_devs, ARRAY_SIZE(msp_devs));
         }
 #endif /* CONFIG_USB_GADGET */
 #endif /* CONFIG_USB_EHCI_HCD || CONFIG_USB_GADGET */