Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dts: arm: Fix incorrect interrupt cells order #25514

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions dts/arm/broadcom/viper-a72.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
arch_timer: timer {
compatible = "arm,arm-timer";
interrupt-parent = <&gic>;
interrupts = <GIC_PPI 13 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_LEVEL>,
<GIC_PPI 14 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_LEVEL>,
<GIC_PPI 11 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_LEVEL>,
<GIC_PPI 10 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_LEVEL>;
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL
IRQ_DEFAULT_PRIORITY>,
<GIC_PPI 14 IRQ_TYPE_LEVEL
IRQ_DEFAULT_PRIORITY>,
<GIC_PPI 11 IRQ_TYPE_LEVEL
IRQ_DEFAULT_PRIORITY>,
<GIC_PPI 10 IRQ_TYPE_LEVEL
IRQ_DEFAULT_PRIORITY>;
label = "arch_timer";
};

Expand All @@ -51,12 +51,12 @@

&uart0 {
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 24 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_LEVEL>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL
IRQ_DEFAULT_PRIORITY>;
};

&uart1 {
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 181 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_LEVEL>;
interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL
IRQ_DEFAULT_PRIORITY>;
};
18 changes: 9 additions & 9 deletions dts/arm/qemu-virt/qemu-virt-a53.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
compatible = "arm,pl011";
reg = <0x9000000 0x1000>;
status = "disabled";
interrupts = <GIC_SPI 1 0 IRQ_TYPE_LEVEL>;
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL 0>;
interrupt-names = "irq_0";
clocks = <&uartclk>;
label = "UART_0";
Expand All @@ -70,14 +70,14 @@

arch_timer: timer {
compatible = "arm,arm-timer";
interrupts = <GIC_PPI 13 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_EDGE>,
<GIC_PPI 14 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_EDGE>,
<GIC_PPI 11 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_EDGE>,
<GIC_PPI 10 IRQ_DEFAULT_PRIORITY
IRQ_TYPE_EDGE>;
interrupts = <GIC_PPI 13 IRQ_TYPE_EDGE
IRQ_DEFAULT_PRIORITY>,
<GIC_PPI 14 IRQ_TYPE_EDGE
IRQ_DEFAULT_PRIORITY>,
<GIC_PPI 11 IRQ_TYPE_EDGE
IRQ_DEFAULT_PRIORITY>,
<GIC_PPI 10 IRQ_TYPE_EDGE
IRQ_DEFAULT_PRIORITY>;
label = "arch_timer";
};
};
Expand Down