[ar71xx] remove duplicated includes
[openwrt.git] / target / linux / s3c24xx / patches-2.6.24 / 1129--neo-bluetooth-GTA01_GPIO_MODEM_RST-GTA02_GPIO_M.patch
1 From 3beacb9939b07b974a9150a0a5848e0fbdb07df9 Mon Sep 17 00:00:00 2001
2 From: Holger Freyther <zecke@openmoko.org>
3 Date: Sun, 13 Apr 2008 07:25:58 +0100
4 Subject: [PATCH] [neo bluetooth] GTA01_GPIO_MODEM_RST != GTA02_GPIO_MODEM_RST
5 The bluetooth enable and modem reset switched the order in
6 gta02. Do not poke the bluetooth dongle when we want to reset
7 the modem.
8
9 Signed-Off-By: Holger Freyther <zecke@openmoko.org>
10 ---
11 arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 9 +++++++--
12 1 files changed, 7 insertions(+), 2 deletions(-)
13
14 diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
15 index cde3dd8..5ad942e 100644
16 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
17 +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
18 @@ -60,7 +60,9 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
19 if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
20 goto out_1;
21 } else if (!strcmp(attr->attr.name, "reset")) {
22 - if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
23 + if (machine_is_neo1973_gta01() && s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
24 + goto out_1;
25 + else if (machine_is_neo1973_gta02() && s3c2410_gpio_getpin(GTA02_GPIO_MODEM_RST))
26 goto out_1;
27 } else if (!strcmp(attr->attr.name, "download")) {
28 if (machine_is_neo1973_gta01()) {
29 @@ -135,7 +137,10 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
30 }
31 }
32 } else if (!strcmp(attr->attr.name, "reset")) {
33 - s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
34 + if (machine_is_neo1973_gta01())
35 + s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
36 + else if (machine_is_neo1973_gta02())
37 + s3c2410_gpio_setpin(GTA02_GPIO_MODEM_RST, on);
38 } else if (!strcmp(attr->attr.name, "download")) {
39 if (machine_is_neo1973_gta01())
40 s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
41 --
42 1.5.6.5
43
This page took 0.04957 seconds and 5 git commands to generate.