Skip to contentSkip to conversation

FAILED: patch "[PATCH] arm64: dts: agilex/stratix10: fix pmu interrupt numbers" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Jan 18, 2020

Subsystems (3)
Stable branch Device tree bindings Arm/socfpga architecture
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 210de0e996aee8e360ccc9e173fe7f0a7ed2f695 Mon Sep 17 00:00:00 2001
From: Dinh Nguyen <[email protected]>
Date: Wed, 20 Nov 2019 09:15:17 -0600
Subject: [PATCH] arm64: dts: agilex/stratix10: fix pmu interrupt numbers

Fix up the correct interrupt numbers for the PMU unit on Agilex and Stratix10.

Fixes 78cd6a9d8e15 ("arm64: dts: Add base stratix 10 dtsi")
Cc linux-stable <[email protected]>
Reported-by Meng Li <[email protected]>
Signed-off-by Dinh Nguyen <[email protected]>
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +4 -4
index 144a2c19ac02..d1fc9c2055f4 100644
@@ -61,10 +61,10 @@ cpu3: cpu@3 {
 
 	pmu {
 		compatible = "arm,armv8-pmuv3";
-		interrupts = <0 120 8>,
-			     <0 121 8>,
-			     <0 122 8>,
-			     <0 123 8>;
+		interrupts = <0 170 4>,
+			     <0 171 4>,
+			     <0 172 4>,
+			     <0 173 4>;
 		interrupt-affinity = <&cpu0>,
 				     <&cpu1>,
 				     <&cpu2>,
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +4 -4
index 94090c6fb946..d43e1299c8ef 100644
@@ -60,10 +60,10 @@ cpu3: cpu@3 {
 
 	pmu {
 		compatible = "arm,armv8-pmuv3";
-		interrupts = <0 120 8>,
-			     <0 121 8>,
-			     <0 122 8>,
-			     <0 123 8>;
+		interrupts = <0 170 4>,
+			     <0 171 4>,
+			     <0 172 4>,
+			     <0 173 4>;
 		interrupt-affinity = <&cpu0>,
 				     <&cpu1>,
 				     <&cpu2>,