]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Aug 2014 17:51:37 +0000 (10:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Aug 2014 17:51:37 +0000 (10:51 -0700)
added patches:
arm-dts-dra7-evm-make-vdda_1v8_phy-supply-always-on.patch
staging-vt6655-fix-warning-on-boot-handle_irq_event_percpu.patch

queue-3.15/arm-dts-dra7-evm-make-vdda_1v8_phy-supply-always-on.patch [new file with mode: 0644]
queue-3.15/series
queue-3.15/staging-vt6655-fix-warning-on-boot-handle_irq_event_percpu.patch [new file with mode: 0644]

diff --git a/queue-3.15/arm-dts-dra7-evm-make-vdda_1v8_phy-supply-always-on.patch b/queue-3.15/arm-dts-dra7-evm-make-vdda_1v8_phy-supply-always-on.patch
new file mode 100644 (file)
index 0000000..6040b30
--- /dev/null
@@ -0,0 +1,43 @@
+From e120fb459693bbc1ac3eabdd65c3659d7cfbfd2a Mon Sep 17 00:00:00 2001
+From: Roger Quadros <rogerq@ti.com>
+Date: Fri, 4 Jul 2014 12:55:43 +0300
+Subject: ARM: dts: dra7-evm: Make VDDA_1V8_PHY supply always on
+
+From: Roger Quadros <rogerq@ti.com>
+
+commit e120fb459693bbc1ac3eabdd65c3659d7cfbfd2a upstream.
+
+After clarification from the hardware team it was found that
+this 1.8V PHY supply can't be switched OFF when SoC is Active.
+
+Since the PHY IPs don't contain isolation logic built in the design to
+allow the power rail to be switched off, there is a very high risk
+of IP reliability and additional leakage paths which can result in
+additional power consumption.
+
+The only scenario where this rail can be switched off is part of Power on
+reset sequencing, but it needs to be kept always-on during operation.
+
+This patch is required for proper functionality of USB, SATA
+and PCIe on DRA7-evm.
+
+CC: Rajendra Nayak <rnayak@ti.com>
+CC: Tero Kristo <t-kristo@ti.com>
+Signed-off-by: Roger Quadros <rogerq@ti.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/dra7-evm.dts |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/boot/dts/dra7-evm.dts
++++ b/arch/arm/boot/dts/dra7-evm.dts
+@@ -182,6 +182,7 @@
+                                       regulator-name = "ldo3";
+                                       regulator-min-microvolt = <1800000>;
+                                       regulator-max-microvolt = <1800000>;
++                                      regulator-always-on;
+                                       regulator-boot-on;
+                               };
index dfddd29c7d3c1ce7d81d619229880d1e4b083b15..c073207234cd06a70c5bf2c6aa2fbfa664e47e74 100644 (file)
@@ -32,3 +32,5 @@ x86-espfix-make-it-possible-to-disable-16-bit-support.patch
 x86_64-entry-xen-do-not-invoke-espfix64-on-xen.patch
 pinctrl-dra-dt-bindings-fix-pull-enable-disable.patch
 vfs-fix-check-for-fallocate-on-active-swapfile.patch
+arm-dts-dra7-evm-make-vdda_1v8_phy-supply-always-on.patch
+staging-vt6655-fix-warning-on-boot-handle_irq_event_percpu.patch
diff --git a/queue-3.15/staging-vt6655-fix-warning-on-boot-handle_irq_event_percpu.patch b/queue-3.15/staging-vt6655-fix-warning-on-boot-handle_irq_event_percpu.patch
new file mode 100644 (file)
index 0000000..917b2b7
--- /dev/null
@@ -0,0 +1,52 @@
+From 6cff1f6ad4c615319c1a146b2aa0af1043c5e9f5 Mon Sep 17 00:00:00 2001
+From: Malcolm Priestley <tvboxspy@gmail.com>
+Date: Wed, 23 Jul 2014 21:35:11 +0100
+Subject: staging: vt6655: Fix Warning on boot handle_irq_event_percpu.
+
+From: Malcolm Priestley <tvboxspy@gmail.com>
+
+commit 6cff1f6ad4c615319c1a146b2aa0af1043c5e9f5 upstream.
+
+WARNING: CPU: 0 PID: 929 at /home/apw/COD/linux/kernel/irq/handle.c:147 handle_irq_event_percpu+0x1d1/0x1e0()
+irq 17 handler device_intr+0x0/0xa80 [vt6655_stage] enabled interrupts
+
+Using spin_lock_irqsave appears to fix this.
+
+Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/staging/vt6655/device_main.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/staging/vt6655/device_main.c
++++ b/drivers/staging/vt6655/device_main.c
+@@ -2430,6 +2430,7 @@ static  irqreturn_t  device_intr(int irq
+       int             handled = 0;
+       unsigned char byData = 0;
+       int             ii = 0;
++      unsigned long flags;
+ //    unsigned char byRSSI;
+       MACvReadISR(pDevice->PortOffset, &pDevice->dwIsr);
+@@ -2455,7 +2456,8 @@ static  irqreturn_t  device_intr(int irq
+       handled = 1;
+       MACvIntDisable(pDevice->PortOffset);
+-      spin_lock_irq(&pDevice->lock);
++
++      spin_lock_irqsave(&pDevice->lock, flags);
+       //Make sure current page is 0
+       VNSvInPortB(pDevice->PortOffset + MAC_REG_PAGE1SEL, &byOrgPageSel);
+@@ -2696,7 +2698,8 @@ static  irqreturn_t  device_intr(int irq
+               MACvSelectPage1(pDevice->PortOffset);
+       }
+-      spin_unlock_irq(&pDevice->lock);
++      spin_unlock_irqrestore(&pDevice->lock, flags);
++
+       MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
+       return IRQ_RETVAL(handled);