Skip to content

Commit ee3878b

Browse files
lategoodbyeKAGA-KOKO
authored andcommitted
irqchip/bcm2836: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND
The BCM2836 interrupt controller doesn't provide any facility to configure the wakeup sources. That's the reason why the driver lacks the irq_set_wake() callback for the interrupt chip. Enable the flags IRQCHIP_SKIP_SET_WAKE and IRQCHIP_MASK_ON_SUSPEND so the interrupt suspend logic can handle the chip correctly equivalently to the corresponding bcm2835 change (9a58480 ("irqchip/bcm2835: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND"). Signed-off-by: Stefan Wahren <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Florian Fainelli <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent f58326c commit ee3878b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/irqchip/irq-bcm2836.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ static struct irq_chip bcm2836_arm_irqchip_timer = {
5858
.name = "bcm2836-timer",
5959
.irq_mask = bcm2836_arm_irqchip_mask_timer_irq,
6060
.irq_unmask = bcm2836_arm_irqchip_unmask_timer_irq,
61+
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
6162
};
6263

6364
static void bcm2836_arm_irqchip_mask_pmu_irq(struct irq_data *d)
@@ -74,6 +75,7 @@ static struct irq_chip bcm2836_arm_irqchip_pmu = {
7475
.name = "bcm2836-pmu",
7576
.irq_mask = bcm2836_arm_irqchip_mask_pmu_irq,
7677
.irq_unmask = bcm2836_arm_irqchip_unmask_pmu_irq,
78+
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
7779
};
7880

7981
static void bcm2836_arm_irqchip_mask_gpu_irq(struct irq_data *d)
@@ -88,6 +90,7 @@ static struct irq_chip bcm2836_arm_irqchip_gpu = {
8890
.name = "bcm2836-gpu",
8991
.irq_mask = bcm2836_arm_irqchip_mask_gpu_irq,
9092
.irq_unmask = bcm2836_arm_irqchip_unmask_gpu_irq,
93+
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
9194
};
9295

9396
static void bcm2836_arm_irqchip_dummy_op(struct irq_data *d)

0 commit comments

Comments
 (0)