diff options
| author | Holger Freyther <zecke@openmoko.org> | 2008-11-19 17:09:38 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:38 +0000 |
| commit | 77739f17fbae2718f4de551969e5c3b47b041978 (patch) | |
| tree | 5b1ededf2769ffbf3ac8426bccb7f21889a2239e /arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | |
| parent | 4c061641acc035be7df5c5f671dca5b82649f919 (diff) | |
[neo bluetooth] GTA01_GPIO_MODEM_RST != GTA02_GPIO_MODEM_RST
The bluetooth enable and modem reset switched the order in
gta02. Do not poke the bluetooth dongle when we want to reset
the modem.
Signed-Off-By: Holger Freyther <zecke@openmoko.org>
Diffstat (limited to 'arch/arm/plat-s3c24xx/neo1973_pm_gsm.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index cde3dd83d1c..5ad942eb3a0 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -60,7 +60,9 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr, if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON)) goto out_1; } else if (!strcmp(attr->attr.name, "reset")) { - if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST)) + if (machine_is_neo1973_gta01() && s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST)) + goto out_1; + else if (machine_is_neo1973_gta02() && s3c2410_gpio_getpin(GTA02_GPIO_MODEM_RST)) goto out_1; } else if (!strcmp(attr->attr.name, "download")) { if (machine_is_neo1973_gta01()) { @@ -135,7 +137,10 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr, } } } else if (!strcmp(attr->attr.name, "reset")) { - s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on); + if (machine_is_neo1973_gta01()) + s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on); + else if (machine_is_neo1973_gta02()) + s3c2410_gpio_setpin(GTA02_GPIO_MODEM_RST, on); } else if (!strcmp(attr->attr.name, "download")) { if (machine_is_neo1973_gta01()) s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on); |