Skip to content

Commit 5ecee47

Browse files
geertusuperna9999
authored andcommitted
arm64: dts: amlogic: s6: Drop CPU masks from GICv3 PPI interrupts
Unlike older GIC variants, the GICv3 DT bindings do not support specifying a CPU mask in PPI interrupt specifiers. Drop the masks. While at it, replace the magic number for IRQ_TYPE_LEVEL_HIGH by its symbolic definition. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Link: https://patch.msgid.link/f9c6eddebebcd2e128edd2dbc51706e23589f9e8.1772643434.git.geert+renesas@glider.be Signed-off-by: Neil Armstrong <[email protected]>
1 parent 028ef9c commit 5ecee47

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353

5454
timer {
5555
compatible = "arm,armv8-timer";
56-
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
57-
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
58-
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
59-
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
56+
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
57+
<GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
58+
<GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
59+
<GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
6060
};
6161

6262
psci {
@@ -84,7 +84,7 @@
8484
interrupt-controller;
8585
reg = <0x0 0xff200000 0 0x10000>,
8686
<0x0 0xff240000 0 0x80000>;
87-
interrupts = <GIC_PPI 9 0xf04>;
87+
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
8888
};
8989

9090
apb: bus@fe000000 {

0 commit comments

Comments
 (0)