diff options
| author | Werner Almesberger <werner@openmoko.org> | 2009-02-07 11:26:33 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-02-07 11:26:33 +0000 |
| commit | a7be0bd1ffc84bba9415da576c49973968f4ae28 (patch) | |
| tree | e4b21a621bd7e8bdbc347fc6351b0c4ae4cbba9b /arch/arm/mach-s3c6410 | |
| parent | d1dcdf5718977c93805f9300b6c79f039db84c8b (diff) | |
Rename GTA03_GPIO_MODEN_ON to GTA03_GPIO_MODEM_ON
Please ignore the previous patch. Here's the right one. I'll now write
100 times "I shall git-pull before making changes." Sorry.
- Werner
---------------------------------- cut here -----------------------------------
> I already tested and measured the signal of the "/MODEM_RST","/MODEM_ON"
[...]
> + s3c_gpio_setpull(GTA03_GPIO_MODEN_ON, S3C_GPIO_PULL_NONE);
~~~~~~~~
Here's a patch that changes GTA03_GPIO_MODEN_ON to GTA03_GPIO_MODEM_ON.
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'arch/arm/mach-s3c6410')
| -rw-r--r-- | arch/arm/mach-s3c6410/include/mach/om-gta03.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6410/om-gta03-features.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c6410/include/mach/om-gta03.h b/arch/arm/mach-s3c6410/include/mach/om-gta03.h index 009574458e1..541c6756f94 100644 --- a/arch/arm/mach-s3c6410/include/mach/om-gta03.h +++ b/arch/arm/mach-s3c6410/include/mach/om-gta03.h @@ -50,7 +50,7 @@ extern struct pcf50633 *om_gta03_pcf; #define GTA03_GPIO_VERSION0 S3C64XX_GPI(8) #define GTA03_GPIO_NWLAN_POWER S3C64XX_GPK(0) -#define GTA03_GPIO_MODEN_ON S3C64XX_GPK(2) +#define GTA03_GPIO_MODEM_ON S3C64XX_GPK(2) #define GTA03_GPIO_LED_TRIG S3C64XX_GPK(3) #define GTA03_GPIO_LED_EN S3C64XX_GPK(4) #define GTA03_GPIO_LCM_RESET S3C64XX_GPK(6) diff --git a/arch/arm/mach-s3c6410/om-gta03-features.c b/arch/arm/mach-s3c6410/om-gta03-features.c index f42476259a9..8d6083da9e9 100644 --- a/arch/arm/mach-s3c6410/om-gta03-features.c +++ b/arch/arm/mach-s3c6410/om-gta03-features.c @@ -101,19 +101,19 @@ static void om_gta03_features_pwron_set_on(enum feature feature) case OM_GTA03_GSM: /* give power to GSM module */ s3c_gpio_setpull(GTA03_GPIO_N_MODEM_RESET, S3C_GPIO_PULL_NONE); - s3c_gpio_setpull(GTA03_GPIO_MODEN_ON, S3C_GPIO_PULL_NONE); + s3c_gpio_setpull(GTA03_GPIO_MODEM_ON, S3C_GPIO_PULL_NONE); s3c_gpio_cfgpin(GTA03_GPIO_N_MODEM_RESET, S3C_GPIO_SFN(1)); - s3c_gpio_cfgpin(GTA03_GPIO_MODEN_ON, S3C_GPIO_SFN(1)); - gpio_direction_output(GTA03_GPIO_MODEN_ON, 1); + s3c_gpio_cfgpin(GTA03_GPIO_MODEM_ON, S3C_GPIO_SFN(1)); + gpio_direction_output(GTA03_GPIO_MODEM_ON, 1); gpio_direction_output(GTA03_GPIO_N_MODEM_RESET, 0); - gpio_direction_output(GTA03_GPIO_MODEN_ON, 0); + gpio_direction_output(GTA03_GPIO_MODEM_ON, 0); msleep(150); gpio_direction_output(GTA03_GPIO_N_MODEM_RESET, 1); msleep(10); /* Release GPIO1 */ s3c_gpio_cfgpin(GTA03_GPIO_N_MODEM_RESET, S3C_GPIO_SFN(0)); msleep(300); - gpio_direction_output(GTA03_GPIO_MODEN_ON, 1); + gpio_direction_output(GTA03_GPIO_MODEM_ON, 1); break; case OM_GTA03_USBHOST: pcf50633_gpio_set(om_gta03_pcf, PCF50633_GPO, 1); @@ -158,10 +158,10 @@ static void om_gta03_features_pwron_set_off(enum feature feature) break; case OM_GTA03_GSM: /* remove power from WLAN / BT module */ - s3c_gpio_cfgpin(GTA03_GPIO_MODEN_ON, S3C_GPIO_SFN(1)); - gpio_direction_output(GTA03_GPIO_MODEN_ON, 0); + s3c_gpio_cfgpin(GTA03_GPIO_MODEM_ON, S3C_GPIO_SFN(1)); + gpio_direction_output(GTA03_GPIO_MODEM_ON, 0); msleep(1100); - gpio_direction_output(GTA03_GPIO_MODEN_ON, 1); + gpio_direction_output(GTA03_GPIO_MODEM_ON, 1); break; case OM_GTA03_USBHOST: pcf50633_gpio_set(om_gta03_pcf, PCF50633_GPO, 0); |