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

Commit d04594c2 authored by Marc Zyngier's avatar Marc Zyngier Committed by Jason Cooper
Browse files

ARM: shmobile: remove use of gic_arch_extn.irq_set_wake 



shmobile only uses gic_arch_extn.irq_set_wake to prevent the GIC
from returning -ENXIO when receiving a wake-up configuration request.

It is a lot simpler to tell the irq layer that we don't need any
configuration by using the IRQCHIP_SKIP_SET_WAKE, thanks to the
new gic_set_irqchip_flags function.

Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Link: https://lkml.kernel.org/r/1426088737-15817-3-git-send-email-marc.zyngier@arm.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 49869be2

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

+1 −6
Original line number Diff line number Diff line
@@ -252,11 +252,6 @@ 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 */

}



#define PINTER0_PHYS 0xe69000a0

#define PINTER1_PHYS 0xe69000a4

#define PINTER0_VIRT IOMEM(0xe69000a0)
@@ -318,8 +313,8 @@ void __init sh73a0_init_irq(void) 
	void __iomem *gic_cpu_base = IOMEM(0xf0000100);

	void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);



	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE);

	gic_init(0, 29, gic_dist_base, gic_cpu_base);

	gic_arch_extn.irq_set_wake = sh73a0_set_wake;



	register_intc_controller(&intcs_desc);

	register_intc_controller(&intc_pint0_desc);

arch/arm/mach-shmobile/setup-r8a7779.c

+1 −6
Original line number Diff line number Diff line
@@ -713,18 +713,13 @@ void __init r8a7779_init_late(void) 
}



#ifdef CONFIG_USE_OF

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

{

	return 0; /* always allow wakeup */

}



void __init r8a7779_init_irq_dt(void)

{

#ifdef CONFIG_ARCH_SHMOBILE_LEGACY

	void __iomem *gic_dist_base = ioremap_nocache(0xf0001000, 0x1000);

	void __iomem *gic_cpu_base = ioremap_nocache(0xf0000100, 0x1000);

#endif

	gic_arch_extn.irq_set_wake = r8a7779_set_wake;

	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE);



#ifdef CONFIG_ARCH_SHMOBILE_LEGACY

	gic_init(0, 29, gic_dist_base, gic_cpu_base);