summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/hdq1w.c
diff options
context:
space:
mode:
authorSourav Poddar <sourav.poddar@ti.com>2014-05-08 11:30:06 +0530
committerTony Lindgren <tony@atomide.com>2014-05-14 14:41:25 -0700
commit8ed43df176ce4e308c96e234a832888b2c28b50e (patch)
tree858018ca78858b9d4eeac412aacbcb74cfcbdfb6 /arch/arm/mach-omap2/hdq1w.c
parent4b4437cbcc9f677313f4597e6d954e1406fcb4d9 (diff)
downloadtalos-op-linux-8ed43df176ce4e308c96e234a832888b2c28b50e.tar.gz
talos-op-linux-8ed43df176ce4e308c96e234a832888b2c28b50e.zip
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>
Diffstat (limited to 'arch/arm/mach-omap2/hdq1w.c')
-rw-r--r--arch/arm/mach-omap2/hdq1w.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/hdq1w.c b/arch/arm/mach-omap2/hdq1w.c
index cbc8e3c480e0..f78b4a161959 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
OpenPOWER on IntegriCloud