]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ARM: omap2+: skip device build from platform code for dt
authorSourav Poddar <sourav.poddar@ti.com>
Thu, 8 May 2014 06:00:06 +0000 (11:30 +0530)
committerTony Lindgren <tony@atomide.com>
Wed, 14 May 2014 21:41:25 +0000 (14:41 -0700)
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>
arch/arm/mach-omap2/hdq1w.c

index cbc8e3c480e0fc23fd0a87e897584f3bc27b2b92..f78b4a161959373715f17621096f3e23b7cfe7d3 100644 (file)
@@ -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