From: Xiao Jiang <jgq516@gmail.com>
Date: Fri, 1 Jun 2012 04:44:15 +0000 (+0800)
Subject: ARM: OMAP: avoid build wdt platform device if with dt support
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6e152231995aa4ed5eafd87a6a8348563248f843;p=linux-beck.git

ARM: OMAP: avoid build wdt platform device if with dt support

If provided dt support, then skip add wdt platform device as usual.

Signed-off-by: Xiao Jiang <jgq516@gmail.com>
Reviewed-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 7b4b9327e543..527c0046064d 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -772,7 +772,7 @@ static int __init omap_init_wdt(void)
 	char *oh_name = "wd_timer2";
 	char *dev_name = "omap_wdt";
 
-	if (!cpu_class_is_omap2())
+	if (!cpu_class_is_omap2() || of_have_populated_dt())
 		return 0;
 
 	oh = omap_hwmod_lookup(oh_name);