fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch b/queue-4.19/arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch
new file mode 100644 (file)
index 0000000..052a7be
--- /dev/null
+++ b/queue-4.19/arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch
@@ -0,0 +1,43 @@
+From 8afd161bf372be2b2768b4e52dcd4fad69aa20e6 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 20 Nov 2019 09:15:17 -0600
+Subject: arm64: dts: agilex/stratix10: fix pmu interrupt numbers
+
+From: Dinh Nguyen <dinguyen@kernel.org>
+
+[ Upstream commit 210de0e996aee8e360ccc9e173fe7f0a7ed2f695 ]
+
+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 <stable@vger.kernel.org>
+Reported-by: Meng Li <Meng.Li@windriver.com>
+Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+index 9a1ea8a46405..85fffe03b96b 100644
+--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
++++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+@@ -59,10 +59,10 @@
+ 
+       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>,
+-- 
+2.20.1
+

diff --git a/queue-4.19/series b/queue-4.19/series
index bf2d7bbbdf60b57c9285d1259b868647caf4371a..138113fd06c9ec1a4d1d52802d0178fb72a2e759 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -48,3 +48,4 @@ net-stmmac-16kb-buffer-must-be-16-byte-aligned.patch
 net-stmmac-enable-16kb-buffer-size.patch
 mm-huge_memory.c-make-__thp_get_unmapped_area-static.patch
 mm-huge_memory.c-thp-fix-conflict-of-above-47bit-hin.patch
+arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch