diff options
| -rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 438f02fe122a..842596d4d31e 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
| @@ -86,10 +86,7 @@ static void spitz_discharge1(int on) | |||
| 86 | gpio_set_value(SPITZ_GPIO_LED_GREEN, on); | 86 | gpio_set_value(SPITZ_GPIO_LED_GREEN, on); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | static unsigned long gpio18_config[] = { | 89 | static unsigned long gpio18_config = GPIO18_GPIO; |
| 90 | GPIO18_RDY, | ||
| 91 | GPIO18_GPIO, | ||
| 92 | }; | ||
| 93 | 90 | ||
| 94 | static void spitz_presuspend(void) | 91 | static void spitz_presuspend(void) |
| 95 | { | 92 | { |
| @@ -112,7 +109,7 @@ static void spitz_presuspend(void) | |||
| 112 | PGSR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; | 109 | PGSR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; |
| 113 | PGSR2 |= GPIO_bit(SPITZ_GPIO_KEY_STROBE0); | 110 | PGSR2 |= GPIO_bit(SPITZ_GPIO_KEY_STROBE0); |
| 114 | 111 | ||
| 115 | pxa2xx_mfp_config(&gpio18_config[0], 1); | 112 | pxa2xx_mfp_config(&gpio18_config, 1); |
| 116 | gpio_request_one(18, GPIOF_OUT_INIT_HIGH, "Unknown"); | 113 | gpio_request_one(18, GPIOF_OUT_INIT_HIGH, "Unknown"); |
| 117 | gpio_free(18); | 114 | gpio_free(18); |
| 118 | 115 | ||
| @@ -131,7 +128,6 @@ static void spitz_presuspend(void) | |||
| 131 | 128 | ||
| 132 | static void spitz_postsuspend(void) | 129 | static void spitz_postsuspend(void) |
| 133 | { | 130 | { |
| 134 | pxa2xx_mfp_config(&gpio18_config[1], 1); | ||
| 135 | } | 131 | } |
| 136 | 132 | ||
| 137 | static int spitz_should_wakeup(unsigned int resume_on_alarm) | 133 | static int spitz_should_wakeup(unsigned int resume_on_alarm) |
