From 54726d5c46c7c6eab88f3726d5b3fb73bd547671 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 5 Oct 2014 13:37:18 -0700 Subject: [PATCH] 3.16-stable patches added patches: arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch --- ...is_dra74x-and-soc_is_dra72x-variants.patch | 46 +++++++++++++++++++ queue-3.16/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 queue-3.16/arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch diff --git a/queue-3.16/arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch b/queue-3.16/arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch new file mode 100644 index 00000000000..a5d833c5c36 --- /dev/null +++ b/queue-3.16/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 +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 + +commit af438fec6cb99fc2e2faf8b16b865af26ce722e6 upstream. + +Use the corresponding compatibles to identify the devices. + +Signed-off-by: Rajendra Nayak +Signed-off-by: Lokesh Vutla +Acked-by: Nishanth Menon +Tested-by: Nishanth Menon +Signed-off-by: Paul Walmsley +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + 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.16/series b/queue-3.16/series index ccf892a4250..65327d1eb45 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -355,3 +355,4 @@ 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 clk-qcom-fix-pll-rate-configurations.patch +arm-dra7-add-support-for-soc_is_dra74x-and-soc_is_dra72x-variants.patch -- 2.47.3