From 6b73fb71452c5b098b98d81248c677dfa9e3e68b Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 27 Apr 2009 23:52:25 -0600 Subject: [PATCH] --- yaml --- r: 144959 b: refs/heads/master c: 005076a16bd4c5ea60905ff475e8af57d60578f1 h: refs/heads/master i: 144957: d8344974dd9aed76c0636a5c3fa14286d923a27a 144955: af074657a8ed9ac642b981c299d1d6c60504b7fe 144951: aae7030488eb8dc708e90dcf9cde0b21f63d0772 144943: 34884001eaf82ae99992bda16ce474fc8d58c4fe 144927: 0fe1c68e803d575baf26398feee016a490fbc7da 144895: 81d02912ae2222481f07c9b1e26a6f38f3a7ba8c v: v3 --- [refs] | 2 +- trunk/arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cad767f3be28..debf62433c46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01caec8396eff7d519e6d85c5a1c860e7d4714e5 +refs/heads/master: 005076a16bd4c5ea60905ff475e8af57d60578f1 diff --git a/trunk/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/trunk/arch/mips/pmc-sierra/msp71xx/msp_setup.c index c93675615f5d..a54e85b3cf29 100644 --- a/trunk/arch/mips/pmc-sierra/msp71xx/msp_setup.c +++ b/trunk/arch/mips/pmc-sierra/msp71xx/msp_setup.c @@ -21,7 +21,6 @@ #if defined(CONFIG_PMC_MSP7120_GW) #include -#include #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!)