aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorDaniel Bateman <faultexception@cyanogenmod.org>2012-11-16 01:03:44 -0600
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-11-16 02:55:55 -0800
commit6560a3fbe4c680c7ef6ba3f062075fe12db966ec (patch)
treeb01b31597a6b23a27c0ef4e461500d3e6b151365 /arch/arm/mach-s5pv210
parent4645b5af63093e42c9aee645c6bf2de6cf8686c6 (diff)
downloadkernel_samsung_aries-6560a3fbe4c680c7ef6ba3f062075fe12db966ec.zip
kernel_samsung_aries-6560a3fbe4c680c7ef6ba3f062075fe12db966ec.tar.gz
kernel_samsung_aries-6560a3fbe4c680c7ef6ba3f062075fe12db966ec.tar.bz2
vibrantmtd: set stock gps gpio config
Change-Id: Ieb8b30668a43c2b5558ac261f71c4d05253a982b
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/mach-aries.c16
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