Commit 9ddc01bf authored by Russell King's avatar Russell King

[ARM] Add IRQ wake support for SA1111 PS/2 interfaces.

parent 08556256
...@@ -87,6 +87,15 @@ static inline void __init neponset_init_irq(void) ...@@ -87,6 +87,15 @@ static inline void __init neponset_init_irq(void)
set_irq_type(IRQ_GPIO25, IRQT_RISING); set_irq_type(IRQ_GPIO25, IRQT_RISING);
set_irq_chained_handler(IRQ_GPIO25, neponset_irq_handler); set_irq_chained_handler(IRQ_GPIO25, neponset_irq_handler);
/*
* We would set IRQ_GPIO25 to be a wake-up IRQ, but
* unfortunately something on the Neponset activates
* this IRQ on sleep (ethernet?)
*/
#if 0
enable_irq_wake(IRQ_GPIO25);
#endif
/* /*
* Setup other Neponset IRQs. SA1111 will be done by the * Setup other Neponset IRQs. SA1111 will be done by the
* generic SA1111 code. * generic SA1111 code.
......
...@@ -145,6 +145,8 @@ static int ps2_open(struct serio *io) ...@@ -145,6 +145,8 @@ static int ps2_open(struct serio *io)
ps2if->open = 1; ps2if->open = 1;
enable_irq_wake(ps2if->dev->irq[0]);
sa1111_writel(PS2CR_ENA, ps2if->base + SA1111_PS2CR); sa1111_writel(PS2CR_ENA, ps2if->base + SA1111_PS2CR);
return 0; return 0;
} }
...@@ -155,6 +157,8 @@ static void ps2_close(struct serio *io) ...@@ -155,6 +157,8 @@ static void ps2_close(struct serio *io)
sa1111_writel(0, ps2if->base + SA1111_PS2CR); sa1111_writel(0, ps2if->base + SA1111_PS2CR);
disable_irq_wake(ps2if->dev->irq[0]);
ps2if->open = 0; ps2if->open = 0;
free_irq(ps2if->dev->irq[1], ps2if); free_irq(ps2if->dev->irq[1], ps2if);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment