From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 2 Jun 2014 23:31:43 +0000 (-0700)
Subject: 3.14-stable patches
X-Git-Tag: v3.14.6~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e704ab5f4361062bb990d49cc852476144dff4eb;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	mips-dts-fix-missing-device_type-memory-property-in-memory-nodes.patch
---

diff --git a/queue-3.14/mips-dts-fix-missing-device_type-memory-property-in-memory-nodes.patch b/queue-3.14/mips-dts-fix-missing-device_type-memory-property-in-memory-nodes.patch
new file mode 100644
index 00000000000..f6fc5b0cfca
--- /dev/null
+++ b/queue-3.14/mips-dts-fix-missing-device_type-memory-property-in-memory-nodes.patch
@@ -0,0 +1,80 @@
+From dfc44f8030653b345fc6fb337558c3a07536823f Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Thu, 17 Apr 2014 18:42:00 +0100
+Subject: mips: dts: Fix missing device_type="memory" property in memory nodes
+
+From: Leif Lindholm <leif.lindholm@linaro.org>
+
+commit dfc44f8030653b345fc6fb337558c3a07536823f upstream.
+
+A few platforms lack a 'device_type = "memory"' for their memory
+nodes, relying on an old ppc quirk in order to discover its memory.
+Add the missing data so that all parsing code can find memory nodes
+correctly.
+
+Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
+Cc: linux-mips@linux-mips.org
+Cc: devicetree@vger.kernel.org
+Cc: Mark Rutland <mark.rutland@arm.com>
+Acked-by: John Crispin <blogic@openwrt.org>
+Signed-off-by: Grant Likely <grant.likely@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/lantiq/dts/easy50712.dts    |    1 +
+ arch/mips/ralink/dts/mt7620a_eval.dts |    1 +
+ arch/mips/ralink/dts/rt2880_eval.dts  |    1 +
+ arch/mips/ralink/dts/rt3052_eval.dts  |    1 +
+ arch/mips/ralink/dts/rt3883_eval.dts  |    1 +
+ 5 files changed, 5 insertions(+)
+
+--- a/arch/mips/lantiq/dts/easy50712.dts
++++ b/arch/mips/lantiq/dts/easy50712.dts
+@@ -8,6 +8,7 @@
+ 	};
+ 
+ 	memory@0 {
++		device_type = "memory";
+ 		reg = <0x0 0x2000000>;
+ 	};
+ 
+--- a/arch/mips/ralink/dts/mt7620a_eval.dts
++++ b/arch/mips/ralink/dts/mt7620a_eval.dts
+@@ -7,6 +7,7 @@
+ 	model = "Ralink MT7620A evaluation board";
+ 
+ 	memory@0 {
++		device_type = "memory";
+ 		reg = <0x0 0x2000000>;
+ 	};
+ 
+--- a/arch/mips/ralink/dts/rt2880_eval.dts
++++ b/arch/mips/ralink/dts/rt2880_eval.dts
+@@ -7,6 +7,7 @@
+ 	model = "Ralink RT2880 evaluation board";
+ 
+ 	memory@0 {
++		device_type = "memory";
+ 		reg = <0x8000000 0x2000000>;
+ 	};
+ 
+--- a/arch/mips/ralink/dts/rt3052_eval.dts
++++ b/arch/mips/ralink/dts/rt3052_eval.dts
+@@ -7,6 +7,7 @@
+ 	model = "Ralink RT3052 evaluation board";
+ 
+ 	memory@0 {
++		device_type = "memory";
+ 		reg = <0x0 0x2000000>;
+ 	};
+ 
+--- a/arch/mips/ralink/dts/rt3883_eval.dts
++++ b/arch/mips/ralink/dts/rt3883_eval.dts
+@@ -7,6 +7,7 @@
+ 	model = "Ralink RT3883 evaluation board";
+ 
+ 	memory@0 {
++		device_type = "memory";
+ 		reg = <0x0 0x2000000>;
+ 	};
+ 
diff --git a/queue-3.14/series b/queue-3.14/series
index 556d9792c37..6d45efd141c 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -1,3 +1,4 @@
 futex-add-another-early-deadlock-detection-check.patch
 futex-prevent-attaching-to-kernel-threads.patch
 mips-loongson2_cpufreq-fix-cpu-clock-rate-setting.patch
+mips-dts-fix-missing-device_type-memory-property-in-memory-nodes.patch