diff options
author | Shane McDonald <mcdonald.shane@gmail.com> | 2009-04-28 01:52:25 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-05-14 08:50:28 -0400 |
commit | 005076a16bd4c5ea60905ff475e8af57d60578f1 (patch) | |
tree | 6cf79aba12a6a2f5ac3944e5aa55ee0adac2004d /arch/mips/pmc-sierra | |
parent | 01caec8396eff7d519e6d85c5a1c860e7d4714e5 (diff) |
MIPS: MSP71xx: Resolve use of non-existent GPIO routines in msp71xx reset
There have been a number of compile problems with the msp71xx configuration
ever since it was included in the linux-mips.org repository. This patch
resolves compilation problems with attempting to reset the board using
non-existent GPIO routines.
This patch has been compile-tested against the current HEAD.
Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pmc-sierra')
-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!) |