[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit c0cd6caf3b81ac82b75d8b9a32ce2ca332e26110
Author: tim.niemeyer at mastersword.de <tim.niemeyer at mastersword.de>
Date:   Sun Mar 22 17:42:36 2009 +0100

    Change disable serial driver for gta02 only
    
    Change RTS and TXD pins on UART 0 to be inputs only on GTA02.
    On GTA01 the UART 0 maybe used otherwise.
    
    [ Werner: removed unexplained addition of DEBUG, Documentation/CodingStyle
      lines 105, 224, and 448. ]
    
    Signed-off-by: Tim Niemeyer <reddog at mastersword.de>
    Signed-off-by: Werner Almesberger <werner at openmoko.org>

diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
index fbd9f0e..98cd95f 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -96,12 +96,17 @@ out_1:
 static void gsm_on_off(struct device *dev, int on)
 {
 	if (!on) {
-		/* do not drive into powered-down GSM side */
-		s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPIO_INPUT);
-		s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPIO_INPUT);
+		if (machine_is_neo1973_gta02()) {
+			/*
+			 * Do not drive into powered-down GSM side
+			 * GTA02 only, because on GTA01 maybe serial
+			 * is used otherwise.
+			 */
+			s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPIO_INPUT);
+			s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPIO_INPUT);
 
-		if (machine_is_neo1973_gta02())
 			pcf50633_gpio_set(gta02_pcf, PCF50633_GPIO2, 0);
+		}
 
 		if (gta01_gsm.gpio_ngsm_en)
 			s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1);

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko