Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485b2ab5 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

ARM: mach-shmobile: sh73a0 gic_arch_extn.irq_set_wake() fix 



Initialize ->irq_set_wake() in gic_arch_extn to unbreak wake
up from the KEYSC device on AG5EVM in case of Suspend-to-RAM.

Without this patch "echo mem > /sys/power/state" and a key
press results in the following message on resume:

WARNING: at kernel/irq/manage.c:507 irq_set_irq_wake+0x7c/0xd8()
Unbalanced IRQ 103 wake disable

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e2a53b7c

arch/arm/mach-shmobile/intc-sh73a0.c

+6 −0
Original line number Diff line number Diff line
@@ -250,6 +250,11 @@ static irqreturn_t sh73a0_intcs_demux(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static int sh73a0_set_wake(struct irq_data *data, unsigned int on)

{

	return 0; /* always allow wakeup */

}



void __init sh73a0_init_irq(void)

{

	void __iomem *gic_dist_base = __io(0xf0001000);
@@ -257,6 +262,7 @@ void __init sh73a0_init_irq(void) 
	void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);



	gic_init(0, 29, gic_dist_base, gic_cpu_base);

	gic_arch_extn.irq_set_wake = sh73a0_set_wake;



	register_intc_controller(&intcs_desc);