3.14-stable patches

added patches:
	arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch

diff --git a/queue-3.14/arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch b/queue-3.14/arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch
new file mode 100644 (file)
index 0000000..a5d833c
--- /dev/null
+++ b/queue-3.14/arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch
@@ -0,0 +1,46 @@
+From af438fec6cb99fc2e2faf8b16b865af26ce722e6 Mon Sep 17 00:00:00 2001
+From: Rajendra Nayak <rnayak@ti.com>
+Date: Wed, 27 Aug 2014 19:38:22 -0600
+Subject: ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants
+
+From: Rajendra Nayak <rnayak@ti.com>
+
+commit af438fec6cb99fc2e2faf8b16b865af26ce722e6 upstream.
+
+Use the corresponding compatibles to identify the devices.
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
+Acked-by: Nishanth Menon <nm@ti.com>
+Tested-by: Nishanth Menon <nm@ti.com>
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-omap2/soc.h |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/mach-omap2/soc.h
++++ b/arch/arm/mach-omap2/soc.h
+@@ -245,6 +245,8 @@ IS_AM_SUBCLASS(437x, 0x437)
+ #define soc_is_omap54xx()             0
+ #define soc_is_omap543x()             0
+ #define soc_is_dra7xx()                       0
++#define soc_is_dra74x()                       0
++#define soc_is_dra72x()                       0
+ 
+ #if defined(MULTI_OMAP2)
+ # if defined(CONFIG_ARCH_OMAP2)
+@@ -393,7 +395,11 @@ IS_OMAP_TYPE(3430, 0x3430)
+ 
+ #if defined(CONFIG_SOC_DRA7XX)
+ #undef soc_is_dra7xx
++#undef soc_is_dra74x
++#undef soc_is_dra72x
+ #define soc_is_dra7xx()       (of_machine_is_compatible("ti,dra7"))
++#define soc_is_dra74x()       (of_machine_is_compatible("ti,dra74"))
++#define soc_is_dra72x()       (of_machine_is_compatible("ti,dra72"))
+ #endif
+ 
+ /* Various silicon revisions for omap2 */

diff --git a/queue-3.14/series b/queue-3.14/series
index 142ab956ef517973b545e6aebb2c78971ef494a2..905cf6ffa750ce7d56622464cd8491b381b0e617 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -236,3 +236,4 @@ aio-block-exit_aio-until-all-context-requests-are-completed.patch
 staging-lustre-disable-virtual-block-device-for-64k-pages.patch
 clk-qcom-fix-mn-frequency-tables-parent-map-and-jpegd.patch
 clk-qcom-mdp_lut_clk-is-a-child-of-mdp_src.patch
+arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch