From 2b04a87a2f52ec7e13463a549ae4c523038cb0c7 Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Thu, 18 Feb 2010 11:41:43 +0900 Subject: [PATCH] s5pc110: neptune: Neptune board detect support Signed-off-by: Kyungmin Park --- board/samsung/universal/universal.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c index 3c27232..84bc4ee 100644 --- a/board/samsung/universal/universal.c +++ b/board/samsung/universal/universal.c @@ -46,10 +46,6 @@ DECLARE_GLOBAL_DATA_PTR; #define C100_MACH_START 3000 #define C110_MACH_START 3100 -/* FIXME Neptune workaround */ -#define USE_NEPTUNE_BOARD -#undef USE_NEPTUNE_BOARD - static unsigned int board_rev; static unsigned int battery_soc; static struct s5pc110_gpio *s5pc110_gpio; @@ -596,10 +592,13 @@ static void check_hw_revision(void) } else { board = MACH_KESSLER; board_rev |= ARIES_BOARD; -#ifdef USE_NEPTUNE_BOARD - board_rev &= ~ARIES_BOARD; - board_rev |= NEPTUNE_BOARD; -#endif + + /* Neptune MP0_5[4] == 1 */ + gpio_direction_input(&gpio->gpio_mp0_5, 4); + if (gpio_get_value(&gpio->gpio_mp0_5, 4) == 1) { + board_rev &= ~ARIES_BOARD; + board_rev |= NEPTUNE_BOARD; + } } gpio_set_pull(&gpio->gpio_j2, 2, GPIO_PULL_DOWN); hwrev3 = 1; -- 2.7.4