r2880 - trunk/src/target/u-boot/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-09-01 11:36:57 +0200 (Sat, 01 Sep 2007)
New Revision: 2880

Modified:
   trunk/src/target/u-boot/patches/series
   trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
* add proper MODEM_ON/MODEM_RST handling to 'neo1973 gsm on' command of GTA02


Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2007-08-31 22:38:21 UTC (rev 2879)
+++ trunk/src/target/u-boot/patches/series	2007-09-01 09:36:57 UTC (rev 2880)
@@ -75,3 +75,4 @@
 # for review, merge soon
 unbusy-i2c.patch 
 usbtty-irq-racecondition-fix.patch
+uboot-serial_terminal.patch

Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch	2007-08-31 22:38:21 UTC (rev 2879)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch	2007-09-01 09:36:57 UTC (rev 2880)
@@ -91,7 +91,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,391 @@
+@@ -0,0 +1,401 @@
 +/*
 + * (C) 2006-2007 by OpenMoko, Inc.
 + * Author: Harald Welte <laforge at openmoko.org>
@@ -427,11 +427,21 @@
 +
 +void neo1973_gsm(int on)
 +{
-+	/* GPIO2 of PMU */
-+	if (on)
++	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
++
++	/* GPIO2 of PMU, GPB7(MODEM_ON)=1 and GPB5(MODEM_RST)=0 */
++	if (on) {
++#if !defined(CONFIG_ARCH_GTA02_v1)
 +		pcf50633_reg_write(PCF50633_REG_GPIO2CFG, 0x07);
-+	else
++#endif
++		gpio->GPBDAT &= ~(1 << 5);
++		gpio->GPBDAT |= (1 << 7);
++	} else {
++		gpio->GPBDAT &= ~(1 << 7);
++#if !defined(CONFIG_ARCH_GTA02_v1)
 +		pcf50633_reg_write(PCF50633_REG_GPIO2CFG, 0x00);
++#endif
++	}
 +}
 +
 +void neo1973_gps(int on)