diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 3 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 36 |
3 files changed, 42 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 49a7021f6ae..ac46bb53c10 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -657,9 +657,12 @@ static void __init gta01_map_io(void) s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs)); } +extern int gta_gsm_interrupts; + static irqreturn_t gta01_modem_irq(int irq, void *param) { printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq); + gta_gsm_interrupts++; return IRQ_HANDLED; } diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 61e4fae2bd3..32854f68398 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -1532,9 +1532,12 @@ static void __init gta02_map_io(void) s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs)); } +extern int gta_gsm_interrupts; + static irqreturn_t gta02_modem_irq(int irq, void *param) { printk(KERN_DEBUG "modem wakeup interrupt\n"); + gta_gsm_interrupts++; return IRQ_HANDLED; } diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index 69729c40174..ab314b405c7 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -31,6 +31,9 @@ #endif +int gta_gsm_interrupts; +EXPORT_SYMBOL(gta_gsm_interrupts); + struct gta01pm_priv { int gpio_ngsm_en; int gpio_ndl_gsm; @@ -75,6 +78,9 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr, if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM)) goto out_1; } + } else if (!strcmp(attr->attr.name, "flowcontrolled")) { + if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) + goto out_1; } return strlcpy(buf, "0\n", 3); @@ -171,6 +177,13 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr, gta01_gsm.gpio_ndl_gsm = !on; s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on); } + } else if (!strcmp(attr->attr.name, "flowcontrolled")) { + if (on) { + gta_gsm_interrupts = 0; + s3c2410_gpio_setpin(S3C2410_GPH1, 1); + s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_OUTP); + } else + s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0); } return count; @@ -179,6 +192,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write); static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write); static DEVICE_ATTR(download, 0644, gsm_read, gsm_write); +static DEVICE_ATTR(flowcontrolled, 0644, gsm_read, gsm_write); #ifdef CONFIG_PM @@ -188,12 +202,31 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state) /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we * don't need to do much here. */ + /* If flowcontrol asserted, abort if GSM already interrupted */ + if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) { + if (gta_gsm_interrupts) + goto busy; + } /* disable DL GSM to prevent jack_insert becoming 'floating' */ if (machine_is_neo1973_gta02()) s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1); return 0; + +busy: + return -EBUSY; +} + +static int +gta01_gsm_suspend_late(struct platform_device *pdev, pm_message_t state) +{ + /* Last chance: abort if GSM already interrupted */ + if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) { + if (gta_gsm_interrupts) + return -EBUSY; + } + return 0; } static int gta01_gsm_resume(struct platform_device *pdev) @@ -213,6 +246,7 @@ static int gta01_gsm_resume(struct platform_device *pdev) } #else #define gta01_gsm_suspend NULL +#define gta01_gsm_suspend_late NULL #define gta01_gsm_resume NULL #endif @@ -220,6 +254,7 @@ static struct attribute *gta01_gsm_sysfs_entries[] = { &dev_attr_power_on.attr, &dev_attr_reset.attr, &dev_attr_download.attr, + &dev_attr_flowcontrolled.attr, NULL }; @@ -297,6 +332,7 @@ static struct platform_driver gta01_gsm_driver = { .probe = gta01_gsm_probe, .remove = gta01_gsm_remove, .suspend = gta01_gsm_suspend, + .suspend_late = gta01_gsm_suspend_late, .resume = gta01_gsm_resume, .driver = { .name = "neo1973-pm-gsm", |