remove queue-3.14/arm-dts-am335x-boneblack-disable-rtc-only-sleep-to-avoid-hardware...

diff --git a/queue-3.14/arm-dts-am335x-boneblack-disable-rtc-only-sleep-to-avoid-hardware-damage.patch b/queue-3.14/arm-dts-am335x-boneblack-disable-rtc-only-sleep-to-avoid-hardware-damage.patch
deleted file mode 100644 (file)
index 7ef6ab2..0000000
--- a/queue-3.14/arm-dts-am335x-boneblack-disable-rtc-only-sleep-to-avoid-hardware-damage.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7a6cb0abe1aa63334f3ded6d2b6c8eca80e72302 Mon Sep 17 00:00:00 2001
-From: Matthijs van Duin <matthijsvanduin@gmail.com>
-Date: Mon, 1 Jun 2015 21:33:28 +0200
-Subject: ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
-
-From: Matthijs van Duin <matthijsvanduin@gmail.com>
-
-commit 7a6cb0abe1aa63334f3ded6d2b6c8eca80e72302 upstream.
-
-Avoid entering "RTC-only mode" at poweroff. It is unsupported by most
-versions of BeagleBone, and risks hardware damage.
-
-The damaging configuration is having system-power-controller
-without ti,pmic-shutdown-controller.
-
-Reported-by: Matthijs van Duin <matthijsvanduin@gmail.com>
-Tested-by: Matthijs van Duin <matthijsvanduin@gmail.com>
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
-Cc: Tony Lindgren <tony@atomide.com>
-Cc: Felipe Balbi <balbi@ti.com>
-Cc: Johan Hovold <johan@kernel.org>
-[Matthijs van Duin: added explanatory comments]
-Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com>
-Fixes: http://bugs.elinux.org/issues/143
-[tony@atomide.com: updated comments with the hardware breaking info]
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/boot/dts/am335x-bone-common.dtsi |   19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -226,6 +226,25 @@
- /include/ "tps65217.dtsi"
- 
- &tps {
-+      /*
-+       * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
-+       * mode") at poweroff.  Most BeagleBone versions do not support RTC-only
-+       * mode and risk hardware damage if this mode is entered.
-+       *
-+       * For details, see linux-omap mailing list May 2015 thread
-+       *      [PATCH] ARM: dts: am335x-bone* enable pmic-shutdown-controller
-+       * In particular, messages:
-+       *      http://www.spinics.net/lists/linux-omap/msg118585.html
-+       *      http://www.spinics.net/lists/linux-omap/msg118615.html
-+       *
-+       * You can override this later with
-+       *      &tps {  /delete-property/ ti,pmic-shutdown-controller;  }
-+       * if you want to use RTC-only mode and made sure you are not affected
-+       * by the hardware problems. (Tip: double-check by performing a current
-+       * measurement after shutdown: it should be less than 1 mA.)
-+       */
-+      ti,pmic-shutdown-controller;
-+
-       regulators {
-               dcdc1_reg: regulator@0 {
-                       regulator-always-on;

diff --git a/queue-3.14/series b/queue-3.14/series
index 44552e7bf75d66f857c5fd99565e2794b4ac5bbb..3e2a3580c6de55269c9f3e8f974cbd90aa596f3a 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -33,7 +33,6 @@ ozwpan-use-proper-check-to-prevent-heap-overflow.patch
 ozwpan-divide-by-zero-leading-to-panic.patch
 ozwpan-unchecked-signed-subtraction-leads-to-dos.patch
 pata_octeon_cf-fix-broken-build.patch
-arm-dts-am335x-boneblack-disable-rtc-only-sleep-to-avoid-hardware-damage.patch
 drm-i915-hsw-fix-workaround-for-server-aux-channel-clock-divisor.patch
 drm-i915-fix-ddc-probe-for-passive-adapters.patch
 drm-radeon-fix-freeze-for-laptop-with-turks-thames-gpu.patch