summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorShane McDonald <mcdonald.shane@gmail.com>2009-04-27 23:52:25 -0600
committerRalf Baechle <ralf@linux-mips.org>2009-05-14 13:50:28 +0100
commit005076a16bd4c5ea60905ff475e8af57d60578f1 (patch)
tree6cf79aba12a6a2f5ac3944e5aa55ee0adac2004d /arch
parent01caec8396eff7d519e6d85c5a1c860e7d4714e5 (diff)
downloadlinux-3.10-005076a16bd4c5ea60905ff475e8af57d60578f1.tar.gz
linux-3.10-005076a16bd4c5ea60905ff475e8af57d60578f1.tar.bz2
linux-3.10-005076a16bd4c5ea60905ff475e8af57d60578f1.zip
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')
-rw-r--r--arch/mips/pmc-sierra/msp71xx/msp_setup.c8
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 c93675615f5..a54e85b3cf2 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -21,7 +21,6 @@
#if defined(CONFIG_PMC_MSP7120_GW)
#include <msp_regops.h>
-#include <msp_gpio.h>
#define MSP_BOARD_RESET_GPIO 9
#endif
@@ -88,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!)