From 76d9737c940ef2cc354ad6625ed77a9980d480ea Mon Sep 17 00:00:00 2001 From: Paul Parsons Date: Wed, 2 May 2012 16:49:24 +0100 Subject: [PATCH] --- yaml --- r: 303425 b: refs/heads/master c: e949f93c591352f0376fdd192b4060a38c102ba5 h: refs/heads/master i: 303423: d869c7f5c9ed1b4d80406f0166629b1db6b51e94 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/hx4700.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 70e43640b772..24711e41355f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89619d44eec8ed95b3b62b2fd6ddc56aeea41a95 +refs/heads/master: e949f93c591352f0376fdd192b4060a38c102ba5 diff --git a/trunk/arch/arm/mach-pxa/hx4700.c b/trunk/arch/arm/mach-pxa/hx4700.c index fe8fb7adcac8..2fe0fa0cb383 100644 --- a/trunk/arch/arm/mach-pxa/hx4700.c +++ b/trunk/arch/arm/mach-pxa/hx4700.c @@ -125,7 +125,7 @@ static unsigned long hx4700_pin_config[] __initdata = { GPIO88_GPIO, /* HX4700 specific input GPIOs */ - GPIO12_GPIO, /* ASIC3_IRQ */ + GPIO12_GPIO | WAKEUP_ON_EDGE_RISE, /* ASIC3_IRQ */ GPIO13_GPIO, /* W3220_IRQ */ GPIO14_GPIO, /* nWLAN_IRQ */ @@ -860,6 +860,7 @@ static void __init hx4700_init(void) int ret; pxa2xx_mfp_config(ARRAY_AND_SIZE(hx4700_pin_config)); + gpio_set_wake(GPIO12_HX4700_ASIC3_IRQ, 1); ret = gpio_request_array(ARRAY_AND_SIZE(global_gpios)); if (ret) pr_err ("hx4700: Failed to request GPIOs.\n");