aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2012-11-21 01:37:25 +0100
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-11-21 13:14:42 +0800
commit8757e168190a6ed2cd4aa23fc59bf86b0091b596 (patch)
tree8e9bed5d9526d34423b9ccab425b5abe0ed28d03 /arch/arm/mach-pxa
parentLinux 3.7-rc6 (diff)
downloadlinux-dev-8757e168190a6ed2cd4aa23fc59bf86b0091b596.tar.xz
linux-dev-8757e168190a6ed2cd4aa23fc59bf86b0091b596.zip
ARM: pxa: fix pxa25x gpio wakeup setting
* Since 3.3 gpio wakeup is broken on pxa25x (tested on corgi and poodle). * Use gpio_set_wake like done for pxa27x with commit id * b95ace54a23e2f8ebb032744cebb17c9f43bf651 Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/pxa25x.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 3352b37b60cf..aeb913eee8a6 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -338,6 +338,10 @@ void __init pxa25x_map_io(void)
pxa25x_get_clk_frequency_khz(1);
}
+static struct pxa_gpio_platform_data pxa25x_gpio_info __initdata = {
+ .gpio_set_wake = gpio_set_wake,
+};
+
static struct platform_device *pxa25x_devices[] __initdata = {
&pxa25x_device_udc,
&pxa_device_pmu,
@@ -370,6 +374,7 @@ static int __init pxa25x_init(void)
register_syscore_ops(&pxa2xx_mfp_syscore_ops);
register_syscore_ops(&pxa2xx_clock_syscore_ops);
+ pxa_register_device(&pxa_device_gpio, &pxa25x_gpio_info);
ret = platform_add_devices(pxa25x_devices,
ARRAY_SIZE(pxa25x_devices));
if (ret)