3.18-stable patches

added patches:
	arm-dts-bcm5301x-correct-gic_ppi-interrupt-flags.patch

diff --git a/queue-3.18/arm-dts-bcm5301x-correct-gic_ppi-interrupt-flags.patch b/queue-3.18/arm-dts-bcm5301x-correct-gic_ppi-interrupt-flags.patch
new file mode 100644 (file)
index 0000000..3c8569c
--- /dev/null
+++ b/queue-3.18/arm-dts-bcm5301x-correct-gic_ppi-interrupt-flags.patch
@@ -0,0 +1,49 @@
+From 0c2bf9f95983fe30aa2f6463cb761cd42c2d521a Mon Sep 17 00:00:00 2001
+From: Jon Mason <jon.mason@broadcom.com>
+Date: Thu, 2 Mar 2017 19:21:32 -0500
+Subject: ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jon Mason <jon.mason@broadcom.com>
+
+commit 0c2bf9f95983fe30aa2f6463cb761cd42c2d521a upstream.
+
+GIC_PPI flags were misconfigured for the timers, resulting in errors
+like:
+[    0.000000] GIC: PPI11 is secure or misconfigured
+
+Changing them to being edge triggered corrects the issue
+
+Suggested-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Jon Mason <jon.mason@broadcom.com>
+Fixes: d27509f1 ("ARM: BCM5301X: add dts files for BCM4708 SoC")
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+[AmitP: Resolved minor cherry-pick conflict]
+Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/bcm5301x.dtsi |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -52,14 +52,14 @@
+               timer@0200 {
+                       compatible = "arm,cortex-a9-global-timer";
+                       reg = <0x0200 0x100>;
+-                      interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
++                      interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
+                       clocks = <&clk_periph>;
+               };
+ 
+               local-timer@0600 {
+                       compatible = "arm,cortex-a9-twd-timer";
+                       reg = <0x0600 0x100>;
+-                      interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
++                      interrupts = <GIC_PPI 13 IRQ_TYPE_EDGE_RISING>;
+                       clocks = <&clk_periph>;
+               };
+ 

diff --git a/queue-3.18/series b/queue-3.18/series
index 6251b936cc69b82e678d34292d92aa934037a310..3a8c652a1e3c0f79e384418f424dc5abb287455b 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -21,3 +21,4 @@ drm-vmwgfx-free-hash-table-allocated-by-cmdbuf-managed-res-mgr.patch
 usb-gadget-f_fs-fix-possibe-deadlock.patch
 sysctl-enable-strict-writes.patch
 mm-numa-avoid-waiting-on-freed-migrated-pages.patch
+arm-dts-bcm5301x-correct-gic_ppi-interrupt-flags.patch