-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1035 from loki666/h700-suspend
Allwinner/linux: rework suspend patch
- Loading branch information
Showing
3 changed files
with
40 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 0 additions & 110 deletions
110
projects/Allwinner/patches/linux/H700/9999-Update-irq-sunxi-nmi.c.patch
This file was deleted.
Oops, something went wrong.
40 changes: 40 additions & 0 deletions
40
projects/Allwinner/patches/linux/H700/9999-irq-sunxi-nmi-add-missings-flags.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From 67b879faf1e3650cae0c8e5712bdb467014435e8 Mon Sep 17 00:00:00 2001 | ||
From: Philippe Simons <[email protected]> | ||
Date: Sat, 28 Dec 2024 18:19:17 +0100 | ||
Subject: [PATCH] irq-sunxi-nmi: add missings flags | ||
|
||
IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND | ||
--- | ||
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 1 + | ||
drivers/irqchip/irq-sunxi-nmi.c | 3 ++- | ||
2 files changed, 3 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | ||
index e88c1fbac..9d4d7b2c6 100644 | ||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | ||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | ||
@@ -867,6 +867,7 @@ nmi_intc: interrupt-controller@7010320 { | ||
interrupt-controller; | ||
#interrupt-cells = <2>; | ||
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; | ||
+ wakeup-source; | ||
}; | ||
|
||
r_pio: pinctrl@7022000 { | ||
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c | ||
index bb92fd85e..b9a534ecd 100644 | ||
--- a/drivers/irqchip/irq-sunxi-nmi.c | ||
+++ b/drivers/irqchip/irq-sunxi-nmi.c | ||
@@ -186,7 +186,8 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node, | ||
gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit; | ||
gc->chip_types[0].chip.irq_eoi = irq_gc_ack_set_bit; | ||
gc->chip_types[0].chip.irq_set_type = sunxi_sc_nmi_set_type; | ||
- gc->chip_types[0].chip.flags = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED; | ||
+ gc->chip_types[0].chip.flags = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED | ||
+ | IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND; | ||
gc->chip_types[0].regs.ack = reg_offs->pend; | ||
gc->chip_types[0].regs.mask = reg_offs->enable; | ||
gc->chip_types[0].regs.type = reg_offs->ctrl; | ||
-- | ||
2.47.1 | ||
|