pinctrl: rockchip: Set wake_enabled
authorDoug Anderson <dianders@chromium.org>
Tue, 21 Oct 2014 17:47:32 +0000 (10:47 -0700)
committerHeiko Stuebner <heiko@sntech.de>
Wed, 29 Oct 2014 20:06:15 +0000 (21:06 +0100)
The rockchip pinctrl driver uses irq_gc_set_wake() but doesn't setup
the .wake_enabled member.  That means that we can never actually use a
pin for wakeup.  When "irq_set_irq_wake()" tries to call through it
will always get a failure from set_irq_wake_real() and will then set
wake_depth to 0.  Assuming you can resume you'll later get an error
message about "Unbalanced IRQ x wake disable".

Signed-off-by: Doug Anderson <dianders@chromium.org>
Tested-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
drivers/pinctrl/pinctrl-rockchip.c

index 016f457..230d8f3 100644 (file)
@@ -1563,6 +1563,7 @@ static int rockchip_interrupts_register(struct platform_device *pdev,
                gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit;
                gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake;
                gc->chip_types[0].chip.irq_set_type = rockchip_irq_set_type;
+               gc->wake_enabled = IRQ_MSK(bank->nr_pins);
 
                irq_set_handler_data(bank->irq, bank);
                irq_set_chained_handler(bank->irq, rockchip_irq_demux);