Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

aries: Revert unneeded GPIO changes

These may be causing the device to randomly die even though they
came from Samsung's official kernel
  • Loading branch information...
commit bae60693261dacdd416ad26b031bd3452733ef08 1 parent 02ec59e
@pawitp pawitp authored
Showing with 8 additions and 8 deletions.
  1. +8 −8 arch/arm/mach-s5pv210/mach-aries.c
View
16 arch/arm/mach-s5pv210/mach-aries.c
@@ -3408,14 +3408,14 @@ static struct gpio_init_data aries_init_gpios[] = {
.drv = S3C_GPIO_DRVSTR_1X,
}, { /* NFC_EN */
.num = S5PV210_GPH1(5),
- .cfg = S3C_GPIO_INPUT,
- .val = S3C_GPIO_SETPIN_NONE,
+ .cfg = S3C_GPIO_OUTPUT,
+ .val = S3C_GPIO_SETPIN_ONE,
.pud = S3C_GPIO_PULL_DOWN,
.drv = S3C_GPIO_DRVSTR_1X,
}, { /* NFC_FIRM */
.num = S5PV210_GPH1(6),
- .cfg = S3C_GPIO_INPUT,
- .val = S3C_GPIO_SETPIN_NONE,
+ .cfg = S3C_GPIO_OUTPUT,
+ .val = S3C_GPIO_SETPIN_ZERO,
.pud = S3C_GPIO_PULL_DOWN,
.drv = S3C_GPIO_DRVSTR_1X,
}, {
@@ -4169,8 +4169,8 @@ static unsigned int aries_sleep_gpio_table[][3] = {
{ S5PV210_GPD0(3), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN},
// GPD1 ---------------------------------------------------
- { S5PV210_GPD1(0), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN},
- { S5PV210_GPD1(1), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN},
+ { S5PV210_GPD1(0), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_NONE},
+ { S5PV210_GPD1(1), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_NONE},
#if defined (CONFIG_SAMSUNG_CAPTIVATE)
{ S5PV210_GPD1(2), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN}, //GPIO_GPD12
{ S5PV210_GPD1(3), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN}, //GPIO_GPD13
@@ -4330,8 +4330,8 @@ static unsigned int aries_sleep_gpio_table[][3] = {
#endif
// GPJ0 ---------------------------------------------------
- { S5PV210_GPJ0(0), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_NONE},
- { S5PV210_GPJ0(1), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_NONE},
+ { S5PV210_GPJ0(0), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN},
+ { S5PV210_GPJ0(1), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN},
{ S5PV210_GPJ0(2), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_NONE},
{ S5PV210_GPJ0(3), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_NONE},
{ S5PV210_GPJ0(4), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_NONE},
Please sign in to comment.
Something went wrong with that request. Please try again.