From subversion@balloonboard.org Fri May 02 12:52:39 2008
Received: from localhost ([127.0.0.1] helo=localhost.localdomain)
	by stoneboat.aleph1.co.uk with esmtp (Exim 4.63)
	(envelope-from <subversion@balloonboard.org>) id 1Jrtoc-0006pg-Th
	for balloon-svn@balloonboard.org; Fri, 02 May 2008 12:52:39 +0100
To: balloon-svn@balloonboard.org
From: subversion@balloonboard.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1Jrtoc-0006pg-Th@stoneboat.aleph1.co.uk>
Date: Fri, 02 May 2008 12:52:38 +0100
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: subversion@balloonboard.org
X-SA-Exim-Scanned: No (on stoneboat.aleph1.co.uk);
	SAEximRunCond expanded to false
Subject: [Balloon-svn] r477 - balloon/trunk/bootldr
X-BeenThere: balloon-svn@balloonboard.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: <balloon-svn.balloonboard.org>
List-Unsubscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=unsubscribe>
List-Archive: <http://balloonboard.org/lurker/list/balloon-svn.html>
List-Post: <mailto:balloon-svn@balloonboard.org>
List-Help: <mailto:balloon-svn-request@balloonboard.org?subject=help>
List-Subscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=subscribe>
X-List-Received-Date: Fri, 02 May 2008 11:52:39 -0000

Author: nick
Date: 2008-05-02 12:52:38 +0100 (Fri, 02 May 2008)
New Revision: 477

Modified:
   balloon/trunk/bootldr/balloon.c
Log:
fix gpio#01 being set to an output for balloon3. Its the unsuspend input

Modified: balloon/trunk/bootldr/balloon.c
===================================================================
--- balloon/trunk/bootldr/balloon.c	2008-05-01 12:54:09 UTC (rev 476)
+++ balloon/trunk/bootldr/balloon.c	2008-05-02 11:52:38 UTC (rev 477)
@@ -80,10 +80,13 @@
     *((unsigned char *)VGENERAL_ADDRESS)=(1<<run232) | (1<<qmute) | (1<<amp_shutdown);
 #endif
 
+// balloon3 uses gpio01 as the unsuspend input so we must not set it as an output
+#ifndef CONFIG_PXA
     /* recall that for GPIOs 1 is output and 0 is input. */
 /* drive nand alive line active */
     GPIO_GPDR_WRITE(GPIO_GPDR_READ() | (1<<nand_power));	
     GPIO_GPCR_WRITE(1<<nand_power);
+#endif
 
 #if 0
 /* set nand power active, all the rest inactive */