diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-aries.c')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-aries.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-aries.c b/arch/arm/mach-s5pv210/mach-aries.c index 76fdbdf..b4c1c11 100644 --- a/arch/arm/mach-s5pv210/mach-aries.c +++ b/arch/arm/mach-s5pv210/mach-aries.c @@ -3364,17 +3364,33 @@ static struct gpio_init_data aries_init_gpios[] = { // GPG3 ---------------------------- { +#if defined(CONFIG_SAMSUNG_VIBRANT) + .num = S5PV210_GPG3(0), // GPIO_GPS_nRST + .cfg = S3C_GPIO_INPUT, + .val = S3C_GPIO_SETPIN_NONE, + .pud = S3C_GPIO_PULL_DOWN, + .drv = S3C_GPIO_DRVSTR_1X, +#else .num = S5PV210_GPG3(0), // GPIO_GPS_nRST .cfg = S3C_GPIO_OUTPUT, .val = S3C_GPIO_SETPIN_ZERO, .pud = S3C_GPIO_PULL_NONE, .drv = S3C_GPIO_DRVSTR_1X, +#endif }, { +#if defined(CONFIG_SAMSUNG_VIBRANT) + .num = S5PV210_GPG3(1), // GPIO_GPS_PWR_EN + .cfg = S3C_GPIO_INPUT, + .val = S3C_GPIO_SETPIN_NONE, + .pud = S3C_GPIO_PULL_DOWN, + .drv = S3C_GPIO_DRVSTR_1X, +#else .num = S5PV210_GPG3(1), // GPIO_GPS_PWR_EN .cfg = S3C_GPIO_OUTPUT, .val = S3C_GPIO_SETPIN_ZERO, .pud = S3C_GPIO_PULL_NONE, .drv = S3C_GPIO_DRVSTR_1X, +#endif }, { #if defined(CONFIG_SAMSUNG_GALAXYSB) .num = S5PV210_GPG3(2), // GPIO_GPS_nRST |