aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorminsu78.kim <minsu78.kim@samsung.com>2010-09-06 23:00:15 -0700
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:45:24 -0800
commitbb79ade57616c92efc7226304f3b9bed0014d931 (patch)
tree828a4ca71d0002480850cfb75e98e91791b2499b /arch/arm
parenta285fa903d9d04aac9f9e44740bb7faae5ee0a83 (diff)
downloadkernel_samsung_crespo-bb79ade57616c92efc7226304f3b9bed0014d931.zip
kernel_samsung_crespo-bb79ade57616c92efc7226304f3b9bed0014d931.tar.gz
kernel_samsung_crespo-bb79ade57616c92efc7226304f3b9bed0014d931.tar.bz2
S5PC11X: PM: change initial gpio setting
Change-Id: I90e444c19191e2fc9f2a40328a076af62a23a120 Signed-off-by: minsu78.kim <minsu78.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s5pv210/mach-herring.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c
index 5e80377..c3a61c1 100644
--- a/arch/arm/mach-s5pv210/mach-herring.c
+++ b/arch/arm/mach-s5pv210/mach-herring.c
@@ -1508,8 +1508,8 @@ static unsigned int jupiter_gpio_table[][8] = {
{ S5PV210_GPH0(6), S3C_GPIO_INPUT, S3C_GPIO_SETPIN_NONE,
S3C_GPIO_PULL_DOWN, S3C_GPIO_DRVSTR_1X, S3C_GPIO_SLEWRATE_FAST,
0, 0 },
- { S5PV210_GPH0(7), S3C_GPIO_INPUT, S3C_GPIO_SETPIN_NONE,
- S3C_GPIO_PULL_DOWN, S3C_GPIO_DRVSTR_1X, S3C_GPIO_SLEWRATE_FAST,
+ { S5PV210_GPH0(7), S3C_GPIO_SFN(0xF), S3C_GPIO_SETPIN_NONE,
+ S3C_GPIO_PULL_NONE, S3C_GPIO_DRVSTR_1X, S3C_GPIO_SLEWRATE_FAST,
0, 0 },
{ S5PV210_GPH1(0), S3C_GPIO_INPUT, S3C_GPIO_SETPIN_NONE,
@@ -1555,8 +1555,8 @@ static unsigned int jupiter_gpio_table[][8] = {
{ S5PV210_GPH2(5), S3C_GPIO_INPUT, S3C_GPIO_SETPIN_NONE,
S3C_GPIO_PULL_DOWN, S3C_GPIO_DRVSTR_1X, S3C_GPIO_SLEWRATE_FAST,
0, 0 },
- { S5PV210_GPH2(6), S3C_GPIO_INPUT, S3C_GPIO_SETPIN_NONE,
- S3C_GPIO_PULL_DOWN, S3C_GPIO_DRVSTR_1X, S3C_GPIO_SLEWRATE_FAST,
+ { S5PV210_GPH2(6), S3C_GPIO_SFN(0xF), S3C_GPIO_SETPIN_NONE,
+ S3C_GPIO_PULL_NONE, S3C_GPIO_DRVSTR_1X, S3C_GPIO_SLEWRATE_FAST,
0, 0 },
{ S5PV210_GPH2(7), S3C_GPIO_INPUT, S3C_GPIO_SETPIN_NONE,
S3C_GPIO_PULL_DOWN, S3C_GPIO_DRVSTR_1X, S3C_GPIO_SLEWRATE_FAST,