diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /arch/mips/pmc-sierra/msp71xx/msp_setup.c | |
parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/mips/pmc-sierra/msp71xx/msp_setup.c')
-rw-r--r-- | arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c index c93675615f5d..a54e85b3cf29 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #if defined(CONFIG_PMC_MSP7120_GW) | 22 | #if defined(CONFIG_PMC_MSP7120_GW) |
23 | #include <msp_regops.h> | 23 | #include <msp_regops.h> |
24 | #include <msp_gpio.h> | ||
25 | #define MSP_BOARD_RESET_GPIO 9 | 24 | #define MSP_BOARD_RESET_GPIO 9 |
26 | #endif | 25 | #endif |
27 | 26 | ||
@@ -88,11 +87,8 @@ void msp7120_reset(void) | |||
88 | * as GPIO char driver may not be enabled and it would look up | 87 | * as GPIO char driver may not be enabled and it would look up |
89 | * data inRAM! | 88 | * data inRAM! |
90 | */ | 89 | */ |
91 | set_value_reg32(GPIO_CFG3_REG, | 90 | set_value_reg32(GPIO_CFG3_REG, 0xf000, 0x8000); |
92 | basic_mode_mask(MSP_BOARD_RESET_GPIO), | 91 | set_reg32(GPIO_DATA3_REG, 8); |
93 | basic_mode(MSP_GPIO_OUTPUT, MSP_BOARD_RESET_GPIO)); | ||
94 | set_reg32(GPIO_DATA3_REG, | ||
95 | basic_data_mask(MSP_BOARD_RESET_GPIO)); | ||
96 | 92 | ||
97 | /* | 93 | /* |
98 | * In case GPIO9 doesn't reset the board (jumper configurable!) | 94 | * In case GPIO9 doesn't reset the board (jumper configurable!) |