From f23552d3f8d8f3893dc5b485ba79ee73895f5b27 Mon Sep 17 00:00:00 2001
From: Ghennadi Procopciuc <ghennadi.procopciuc@nxp.com>
Date: Fri, 18 Nov 2022 12:07:44 +0200
Subject: [PATCH] dts: s32cc: Reorder generic timer interrupts

The ARMv8 timer driver expects a certain order of interrupts
when the interrupt names are not used in bindings. This is how
the interrupts were mapped:

Expected   |  SoC IRQ
 order     |    ID
----------------------
 sec-phys  | hyp-phys
 phys      | virt
 virt      | hyp-virt
 hyp-phys  | sec-phys
 hyp-virt  | phys

Adding names to interrupts helps to correctly map the interrupts
onto driver's expectations.

Issue: ALB-9425
Signed-off-by: Ghennadi Procopciuc <ghennadi.procopciuc@nxp.com>
---
 arch/arm64/boot/dts/freescale/s32cc.dtsi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/s32cc.dtsi b/arch/arm64/boot/dts/freescale/s32cc.dtsi
index 41752c7226a8..9a92347c1d0f 100644
--- a/arch/arm64/boot/dts/freescale/s32cc.dtsi
+++ b/arch/arm64/boot/dts/freescale/s32cc.dtsi
@@ -131,10 +131,12 @@
 
 	generic_timer: timer {
 		compatible = "arm,armv8-timer";
-		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
-			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
+		interrupts = <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>,
 			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
-			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
+			     <GIC_PPI 12 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-names = "hyp-phys", "virt", "hyp-virt", "sec-phys", "phys";
 	};
 
 	reserved-memory  {