diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2010-01-08 00:32:46 -0500 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-11 11:25:00 -0400 |
commit | e63f591a8ce5d3b5214a14d6cebaad7b6c1c4b4c (patch) | |
tree | 8f909d696133fa97f306f2fde5eb056c7f3a382d /arch/arm/mach-pxa/corgi.c | |
parent | b6eede112673678f8a7a1680d6ad12245443829d (diff) |
[ARM] pxa/corgi: use generic GPIO API and remove pxa_gpio_mode()
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/corgi.c')
-rw-r--r-- | arch/arm/mach-pxa/corgi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index da3156d8690b..788343d0ffe1 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -130,11 +130,15 @@ static unsigned long corgi_pin_config[] __initdata = { | |||
130 | /* GPIO */ | 130 | /* GPIO */ |
131 | GPIO9_GPIO, /* CORGI_GPIO_nSD_DETECT */ | 131 | GPIO9_GPIO, /* CORGI_GPIO_nSD_DETECT */ |
132 | GPIO7_GPIO, /* CORGI_GPIO_nSD_WP */ | 132 | GPIO7_GPIO, /* CORGI_GPIO_nSD_WP */ |
133 | GPIO33_GPIO, /* CORGI_GPIO_SD_PWR */ | 133 | GPIO21_GPIO, /* CORGI_GPIO_ADC_TEMP */ |
134 | GPIO22_GPIO, /* CORGI_GPIO_IR_ON */ | 134 | GPIO22_GPIO, /* CORGI_GPIO_IR_ON */ |
135 | GPIO33_GPIO, /* CORGI_GPIO_SD_PWR */ | ||
136 | GPIO38_GPIO, /* CORGI_GPIO_CHRG_ON */ | ||
137 | GPIO43_GPIO, /* CORGI_GPIO_CHRG_UKN */ | ||
135 | GPIO44_GPIO, /* CORGI_GPIO_HSYNC */ | 138 | GPIO44_GPIO, /* CORGI_GPIO_HSYNC */ |
136 | 139 | ||
137 | GPIO1_GPIO | WAKEUP_ON_EDGE_RISE, | 140 | GPIO0_GPIO | WAKEUP_ON_EDGE_BOTH, /* CORGI_GPIO_KEY_INT */ |
141 | GPIO1_GPIO | WAKEUP_ON_EDGE_RISE, /* CORGI_GPIO_AC_IN */ | ||
138 | }; | 142 | }; |
139 | 143 | ||
140 | /* | 144 | /* |