From: Sourav Poddar <sourav.poddar@ti.com>
Date: Thu, 8 May 2014 06:00:06 +0000 (+0530)
Subject: ARM: omap2+: skip device build from platform code for dt
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8ed43df176ce4e308c96e234a832888b2c28b50e;p=linux.git

ARM: omap2+: skip device build from platform code for dt

For SOCs with dt enabled, device should be build through device tree.
Prevent device build call from platform code, if device tree is
enabled.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/hdq1w.c b/arch/arm/mach-omap2/hdq1w.c
index cbc8e3c480e0f..f78b4a1619593 100644
--- a/arch/arm/mach-omap2/hdq1w.c
+++ b/arch/arm/mach-omap2/hdq1w.c
@@ -76,6 +76,7 @@ int omap_hdq1w_reset(struct omap_hwmod *oh)
 	return 0;
 }
 
+#ifndef CONFIG_OF
 static int __init omap_init_hdq(void)
 {
 	int id = -1;
@@ -95,3 +96,4 @@ static int __init omap_init_hdq(void)
 	return 0;
 }
 omap_arch_initcall(omap_init_hdq);
+#endif