From 791a1583d5de34aa700cdf60a314b01b9a2d188f Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 19 Jan 2020 14:04:59 -0500 Subject: [PATCH] fixes for 4.4 Signed-off-by: Sasha Levin --- ...-stratix10-fix-pmu-interrupt-numbers.patch | 43 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-4.4/arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch diff --git a/queue-4.4/arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch b/queue-4.4/arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch new file mode 100644 index 00000000000..fc8b4660e9b --- /dev/null +++ b/queue-4.4/arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch @@ -0,0 +1,43 @@ +From 638ec967c88af923cb673e24c7d6904151462e4b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Nov 2019 09:15:17 -0600 +Subject: arm64: dts: agilex/stratix10: fix pmu interrupt numbers + +From: Dinh Nguyen + +[ 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 +Reported-by: Meng Li +Signed-off-by: Dinh Nguyen +Signed-off-by: Sasha Levin +--- + 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 6a37101344aa..751d8b60df1d 100644 +--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi ++++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +@@ -56,10 +56,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.4/series b/queue-4.4/series index 3251e39cc55..6223bd3a2eb 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -57,3 +57,4 @@ usb-serial-io_edgeport-handle-unbound-ports-on-urb-c.patch usb-serial-keyspan-handle-unbound-ports.patch scsi-fnic-use-kernel-s-pm-format-option-to-print-mac.patch scsi-fnic-fix-invalid-stack-access.patch +arm64-dts-agilex-stratix10-fix-pmu-interrupt-numbers.patch -- 2.47.3