Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / mips / pmc-sierra / msp71xx / msp_setup.c

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
index 8f69b789be90c8690455dd16e73b2fc4e5525b30..a54e85b3cf29c10bbfb421aa7e2ddc7c111e460a 100644 (file)
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -21,11 +21,9 @@
 
 #if defined(CONFIG_PMC_MSP7120_GW)
 #include <msp_regops.h>
-#include <msp_gpio.h>
 #define MSP_BOARD_RESET_GPIO   9
 #endif
 
-extern void msp_timer_init(void);
 extern void msp_serial_setup(void);
 extern void pmctwiled_setup(void);
 
@@ -89,11 +87,8 @@ void msp7120_reset(void)
         * as GPIO char driver may not be enabled and it would look up
         * data inRAM!
         */
-       set_value_reg32(GPIO_CFG3_REG,
-                       basic_mode_mask(MSP_BOARD_RESET_GPIO),
-                       basic_mode(MSP_GPIO_OUTPUT, MSP_BOARD_RESET_GPIO));
-       set_reg32(GPIO_DATA3_REG,
-                       basic_data_mask(MSP_BOARD_RESET_GPIO));
+       set_value_reg32(GPIO_CFG3_REG, 0xf000, 0x8000);
+       set_reg32(GPIO_DATA3_REG, 8);
 
        /*
         * In case GPIO9 doesn't reset the board (jumper configurable!)
@@ -149,8 +144,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 +169,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 +186,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 +200,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();