From 7617265e42084410cc3b486b7f2ebf4a94b90bce Mon Sep 17 00:00:00 2001 From: Valentin Longchamp Date: Tue, 3 Nov 2009 18:09:48 +0100 Subject: [PATCH] --- yaml --- r: 172459 b: refs/heads/master c: 10949fff622e1488f0c534a10bca8edf5df95682 h: refs/heads/master i: 172457: 81d1a358501e80607d58352ed41a4b3c5e88c10b 172455: 1db50174bcfb3c68e5fd2140defd9fa8eb3e0e67 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 03c9dbd8385d..5abc8c8beeee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 421bf82e996826452ebe2011419f846a61950784 +refs/heads/master: 10949fff622e1488f0c534a10bca8edf5df95682 diff --git a/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c b/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c index 2bfaffb344f0..6b06faf0cf30 100644 --- a/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c @@ -49,6 +49,8 @@ static unsigned int marxbot_pins[] = { MX31_PIN_TXD2__GPIO1_28, /* dsPIC resets */ MX31_PIN_STXD5__GPIO1_21, MX31_PIN_SRXD5__GPIO1_22, + /*battery detection */ + MX31_PIN_LCS0__GPIO3_23, }; #define SDHC2_CD IOMUX_TO_GPIO(MX31_PIN_ATA_DIOR) @@ -133,4 +135,9 @@ void __init mx31moboard_marxbot_init(void) dspics_resets_init(); mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata); + + /* battery present pin */ + gpio_request(IOMUX_TO_GPIO(MX31_PIN_LCS0), "bat-present"); + gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_LCS0)); + gpio_export(IOMUX_TO_GPIO(MX31_PIN_LCS0), false); }