47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
From f5d2660aaa6b05397714ffb48e2e71c71cef0bdd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mike Westerhof <mwester@dls.net>
|
||
|
|
Date: Fri, 4 Jul 2008 08:24:25 +0100
|
||
|
|
Subject: [PATCH] Remove some bits of nspy + GSM flow control patches that leaked into stable
|
||
|
|
|
||
|
|
Signed-off-by: Mike Westerhof <mwester@dls.net>
|
||
|
|
---
|
||
|
|
arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 15 ---------------
|
||
|
|
1 files changed, 0 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
|
||
|
|
index f3c9504..5ef23d1 100644
|
||
|
|
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
|
||
|
|
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
|
||
|
|
@@ -34,15 +34,6 @@
|
||
|
|
extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
|
||
|
|
resume_dependency, int uart_index);
|
||
|
|
|
||
|
|
-/* flag set if we flow-controlled the GSM in our suspend routine */
|
||
|
|
-int gsm_auto_flowcontrolled;
|
||
|
|
-
|
||
|
|
-int gta01_gsm_enabled;
|
||
|
|
-EXPORT_SYMBOL(gta01_gsm_enabled);
|
||
|
|
-
|
||
|
|
-int gta_gsm_interrupts;
|
||
|
|
-EXPORT_SYMBOL(gta_gsm_interrupts);
|
||
|
|
-
|
||
|
|
struct gta01pm_priv {
|
||
|
|
int gpio_ngsm_en;
|
||
|
|
int gpio_ndl_gsm;
|
||
|
|
@@ -233,12 +224,6 @@ static int gta01_gsm_resume(struct platform_device *pdev)
|
||
|
|
if (machine_is_neo1973_gta02())
|
||
|
|
s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, gta01_gsm.gpio_ndl_gsm);
|
||
|
|
|
||
|
|
- /* If we forced flow-control on the GSM, we should also release it */
|
||
|
|
- if (gsm_auto_flowcontrolled) {
|
||
|
|
- s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
|
||
|
|
- gsm_auto_flowcontrolled = 0;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
--
|
||
|
|
1.5.6.5
|
||
|
|
|